aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-09-28 14:07:23 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-09-28 14:07:23 +0000
commitbbdb4e55f6eceb40c2047c614f5b47cef253dfb0 (patch)
tree76c4044567b02f92dab779c85505942a0c3629d7 /activerecord/CHANGELOG
parent078bd0515e8342165a4bc3b8fcc4faa318ebb188 (diff)
downloadrails-bbdb4e55f6eceb40c2047c614f5b47cef253dfb0.tar.gz
rails-bbdb4e55f6eceb40c2047c614f5b47cef253dfb0.tar.bz2
rails-bbdb4e55f6eceb40c2047c614f5b47cef253dfb0.zip
Added :include option to to_json (closes #9677) [chuyeow]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7663 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/CHANGELOG')
-rw-r--r--activerecord/CHANGELOG2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index d32ad83791..c4387e9778 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -10,7 +10,7 @@
* Added the possibility of using symbols in addition to concrete classes with ActiveRecord::Observer#observe #3998 [robbyrussell/tarmo]
-* Added ActiveRecord::Base#to_json/from_json (currently does not support :include like to_xml) [DHH]
+* Added ActiveRecord::Base#to_json/from_json [DHH/chuyeow]
* Added ActiveRecord::Base#from_xml [DHH]. Example: