aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-11 09:04:41 -0700
committerJosé Valim <jose.valim@gmail.com>2011-05-11 09:04:41 -0700
commit9823c17c6a7c9fb046b3233d57acfbc009d5ad48 (patch)
treeb35337a585c30a98dbec54ff1914b7dcaa53ee72 /activesupport
parent55cfbd4809e17bf8e5bb057021b4be7f08648138 (diff)
parent49cd41f7df9c1d7aed519684cdbb35efb9dfebb3 (diff)
downloadrails-9823c17c6a7c9fb046b3233d57acfbc009d5ad48.tar.gz
rails-9823c17c6a7c9fb046b3233d57acfbc009d5ad48.tar.bz2
rails-9823c17c6a7c9fb046b3233d57acfbc009d5ad48.zip
Merge pull request #515 from joshk/patch-3
updated the ActiveSupport changelog
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index feff37cddf..b5b0af8e85 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -19,6 +19,8 @@ advantage of the new ClassCache.
* Added before_remove_const callback to ActiveSupport::Dependencies.remove_unloadable_constants! [Andrew White]
+* JSON decoding now uses the multi_json gem which also vendors a json engine called OkJson. The yaml backend has been removed in favor of OkJson as a default engine for 1.8.x, while the built in 1.9.x json implementation will be used by default. [Josh Kalderimis]
+
*Rails 3.0.7 (April 18, 2011)*