diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-04 03:28:42 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-04 03:28:42 +0000 |
commit | b1968708e12972515fdc8eefdcaff95edbebc76b (patch) | |
tree | 93c179fda5d5428bb12bbdb4332f4450d523f77c /activerecord/lib | |
parent | a30a1a9d5f06f404421d65393bcf9d73885789cb (diff) | |
download | rails-b1968708e12972515fdc8eefdcaff95edbebc76b.tar.gz rails-b1968708e12972515fdc8eefdcaff95edbebc76b.tar.bz2 rails-b1968708e12972515fdc8eefdcaff95edbebc76b.zip |
Hash#to_json takes :only or :except options to specific or omit certain hash keys. Enumerable#to_json passes through its options to each element. Closes #9751.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7736 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/serializers/json_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/serializers/json_serializer.rb b/activerecord/lib/active_record/serializers/json_serializer.rb index 97025ae4d3..8b1b8299f8 100644 --- a/activerecord/lib/active_record/serializers/json_serializer.rb +++ b/activerecord/lib/active_record/serializers/json_serializer.rb @@ -1,6 +1,6 @@ module ActiveRecord #:nodoc: module Serialization - def to_json(options = {}, &block) + def to_json(options = {}) JsonSerializer.new(self, options).to_s end |