diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-04-13 23:55:33 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-04-13 23:55:33 +0530 |
commit | 130d3a06ade83aec27cf1d2ff841dce9e0ad4dfd (patch) | |
tree | bf282263768a0d05ab50638cc04ea0f39928f8b3 /activerecord/lib/active_record/attribute_methods | |
parent | 48e9ff75c4a84a3edd0dedf4ec5aa5bc84462401 (diff) | |
parent | e890a69500531d5fcca0ad6617ace044ee62bf93 (diff) | |
download | rails-130d3a06ade83aec27cf1d2ff841dce9e0ad4dfd.tar.gz rails-130d3a06ade83aec27cf1d2ff841dce9e0ad4dfd.tar.bz2 rails-130d3a06ade83aec27cf1d2ff841dce9e0ad4dfd.zip |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods')
-rw-r--r-- | activerecord/lib/active_record/attribute_methods/serialization.rb | 4 |
1 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 ae49fd4b88..7f1ebab4cd 100644 --- a/activerecord/lib/active_record/attribute_methods/serialization.rb +++ b/activerecord/lib/active_record/attribute_methods/serialization.rb @@ -93,10 +93,10 @@ module ActiveRecord # This is only added to the model when serialize is called, which # ensures we do not make things slower when serialization is not used. - module Behavior #:nodoc: + module Behavior # :nodoc: extend ActiveSupport::Concern - module ClassMethods + module ClassMethods # :nodoc: def initialize_attributes(attributes, options = {}) serialized = (options.delete(:serialized) { true }) ? :serialized : :unserialized super(attributes, options) |