diff options
author | José Valim <jose.valim@plataformatec.com.br> | 2012-07-07 00:48:59 -0700 |
---|---|---|
committer | José Valim <jose.valim@plataformatec.com.br> | 2012-07-07 00:48:59 -0700 |
commit | c7779c6fcdf026e50d54f0eaae957d750d8f37f3 (patch) | |
tree | 8591df2cd910a03bb845c6b459b04890ac84372f /activerecord/lib/active_record | |
parent | 967f5f372009e0a44ba7042708a1b2865ac893e6 (diff) | |
parent | 75322ac5b84198b16ad2202888a620ffec6ca9aa (diff) | |
download | rails-c7779c6fcdf026e50d54f0eaae957d750d8f37f3.tar.gz rails-c7779c6fcdf026e50d54f0eaae957d750d8f37f3.tar.bz2 rails-c7779c6fcdf026e50d54f0eaae957d750d8f37f3.zip |
Merge pull request #6997 from kennyj/fix_stored_attributes
Added *instance_writer: false* to stored/serialized attributes.
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/attribute_methods/serialization.rb | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/store.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/serialization.rb b/activerecord/lib/active_record/attribute_methods/serialization.rb index 4af4d28b74..49ab3ab808 100644 --- a/activerecord/lib/active_record/attribute_methods/serialization.rb +++ b/activerecord/lib/active_record/attribute_methods/serialization.rb @@ -6,7 +6,7 @@ module ActiveRecord included do # Returns a hash of all the attributes that have been specified for serialization as # keys and their class restriction as values. - class_attribute :serialized_attributes + class_attribute :serialized_attributes, instance_writer: false self.serialized_attributes = {} end diff --git a/activerecord/lib/active_record/store.rb b/activerecord/lib/active_record/store.rb index 2af5b02fb7..d836acf18f 100644 --- a/activerecord/lib/active_record/store.rb +++ b/activerecord/lib/active_record/store.rb @@ -43,7 +43,7 @@ module ActiveRecord extend ActiveSupport::Concern included do - class_attribute :stored_attributes + class_attribute :stored_attributes, instance_writer: false self.stored_attributes = {} end |