diff options
| author | Bryan Woods <bryanwoods4e@gmail.com> | 2010-06-16 15:53:20 -0400 |
|---|---|---|
| committer | Bryan Woods <bryanwoods4e@gmail.com> | 2010-06-16 15:53:20 -0400 |
| commit | 5861fde01fbe9446666b319dfc8d24514aafda21 (patch) | |
| tree | 4c78ceda7ec49a54b1c2454217e85d36d1a937aa /activerecord/lib/active_record/serialization.rb | |
| parent | c1ff781001af157c0d5ea5ac64e1fa17d47fe1f1 (diff) | |
| parent | 35e3f72af29a33189a46a4b5ada84768b87e0ef2 (diff) | |
| download | rails-5861fde01fbe9446666b319dfc8d24514aafda21.tar.gz rails-5861fde01fbe9446666b319dfc8d24514aafda21.tar.bz2 rails-5861fde01fbe9446666b319dfc8d24514aafda21.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'activerecord/lib/active_record/serialization.rb')
| -rw-r--r-- | activerecord/lib/active_record/serialization.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/serialization.rb b/activerecord/lib/active_record/serialization.rb index b49471f7ab..2d8bd184f3 100644 --- a/activerecord/lib/active_record/serialization.rb +++ b/activerecord/lib/active_record/serialization.rb @@ -1,4 +1,5 @@ module ActiveRecord #:nodoc: + # = Active Record Serialization module Serialization extend ActiveSupport::Concern include ActiveModel::Serializers::JSON @@ -22,6 +23,7 @@ module ActiveRecord #:nodoc: private # Add associations specified via the <tt>:includes</tt> option. + # # Expects a block that takes as arguments: # +association+ - name of the association # +records+ - the association record(s) to be serialized |