From e86d1cd621ca62af6f71b04032b1e07a66c06bb6 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 20 Sep 2007 23:22:30 +0000
Subject: Added ActiveRecord::Base#to_json/from_json (currently does not
 support :include like to_xml) [DHH]. Added ActiveRecord::Base#from_xml [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7519 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 activerecord/CHANGELOG | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'activerecord/CHANGELOG')

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index aae27a9b58..7e575f4f29 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,12 @@
 *SVN*
 
+* Added ActiveRecord::Base#to_json/from_json (currently does not support :include like to_xml) [DHH]
+
+* Added ActiveRecord::Base#from_xml [DHH]. Example:
+
+    xml = "<person><name>David</name></person>"
+    Person.new.from_xml(xml).name # => "David"
+
 * Define dynamic finders as real methods after first usage. [bscofield]
 
 * Deprecation: remove deprecated threaded_connections methods. Use allow_concurrency instead.  [Jeremy Kemper]
-- 
cgit v1.2.3