3 2 stable json patch #6553

Merged
merged 2 commits into from May 30, 2012

Conversation

Projects
None yet
3 participants

Backport of #6546 and deprecate ActiveSupport::JSON::Variable

See #6536 for the reasoning.

I'm still new to the Rails code base (but intend on being a regular contributor), hopefully I went about this the correct way.

Erich Menge
True, False, and Nil should be represented in as_json as themselves.
Conflicts:

	activesupport/lib/active_support/json/encoding.rb
	activesupport/test/json/encoding_test.rb

@jeremy it appears that DeprecatedConstantProxy is used only for replacing constants, so I used #warn instead.

Owner

rafaelfranca commented May 30, 2012

Could you add a CHANGELOG entry?

@rafaelfranca Sorry about that, didn't want to presume! CHANGELOG updated.

drogus added a commit that referenced this pull request May 30, 2012

@drogus drogus merged commit 9f1b689 into rails:3-2-stable May 30, 2012

@erichmenge erichmenge deleted the erichmenge:3-2-stable-json-patch branch Feb 4, 2013

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