Backport multi_json dependency revert of #5861 to 3-1-stable #8846

Merged
merged 1 commit into from Jan 9, 2013

Projects

None yet

5 participants

@AlexRiedler

Revert #5861. Feature-detect which MultiJson API to use.
Conflicts:
activesupport/activesupport.gemspec

This backports multi_json version depedency changes as applied.

Rationale: #5861

Patch by sferik (cherry-picked)

@rafaelfranca
Ruby on Rails member

CHANGELOG entry?

@AlexRiedler

Oops, thanks @rafaelfranca ; Added.

@rafaelfranca rafaelfranca commented on the diff Jan 9, 2013
activesupport/CHANGELOG.md
@@ -1,3 +1,8 @@
+
@rafaelfranca
rafaelfranca Jan 9, 2013

It is missing the header with the next Rails version (3.1.11)

@AlexRiedler
AlexRiedler Jan 9, 2013

added (without date); I am kinda new to this, I would assume this would not create a new release and that it would be more than just this change, if that is not true I will add the current date?

@rafaelfranca
rafaelfranca Jan 9, 2013

Yes, since 3.1.x only get security releases we don't know when will be the next release.

@jeremy jeremy Merge pull request #5896 from sferik/revert_5861
Revert #5861. Feature-detect which MultiJson API to use.
Conflicts:
	activesupport/activesupport.gemspec

This backports multi_json version depedency changes as applied.

Rationale: #5861

Patch by sferik
7b9bab6
@rafaelfranca rafaelfranca merged commit b816e8e into rails:3-1-stable Jan 9, 2013
@nandayadav

@rafaelfranca "Yes, since 3.1.x only get security releases we don't know when will be the next release."
Does it mean I should roll with 3-1-stable branch(I can;t upgrade to 3.1.10 because of this multi_json dependency issues)?

@carlosantoniodasilva
Ruby on Rails member

@nandayadav yeah, you should be able to stick with the branch for now.

@nandayadav

great, thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment