diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-10-20 11:35:16 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-10-20 11:35:16 -0700 |
commit | 4ed156336faaa378e0329f4e96c3f4c30ddaee09 (patch) | |
tree | aa33ec39f3ee65559553279421c8df8515c3ea99 /activerecord/lib/active_record/attribute_methods | |
parent | c869ce02265299994df4c2333228d1be7538a665 (diff) | |
download | rails-4ed156336faaa378e0329f4e96c3f4c30ddaee09.tar.gz rails-4ed156336faaa378e0329f4e96c3f4c30ddaee09.tar.bz2 rails-4ed156336faaa378e0329f4e96c3f4c30ddaee09.zip |
Revert "Get rid of the ActiveRecord::Model::DeprecationProxy thing."
This reverts commit 83846838252397b3781eed165ca301e05db39293.
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods')
3 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/dirty.rb b/activerecord/lib/active_record/attribute_methods/dirty.rb index b4d227eeee..59f209cec8 100644 --- a/activerecord/lib/active_record/attribute_methods/dirty.rb +++ b/activerecord/lib/active_record/attribute_methods/dirty.rb @@ -2,7 +2,7 @@ require 'active_support/core_ext/module/attribute_accessors' require 'active_support/deprecation' module ActiveRecord - ActiveSupport.on_load(:active_record_model) do + ActiveSupport.on_load(:active_record_config) do mattr_accessor :partial_writes, instance_accessor: false self.partial_writes = true end diff --git a/activerecord/lib/active_record/attribute_methods/read.rb b/activerecord/lib/active_record/attribute_methods/read.rb index 1b1e732eb1..46fd6ebfb3 100644 --- a/activerecord/lib/active_record/attribute_methods/read.rb +++ b/activerecord/lib/active_record/attribute_methods/read.rb @@ -1,5 +1,5 @@ module ActiveRecord - ActiveSupport.on_load(:active_record_model) do + ActiveSupport.on_load(:active_record_config) do mattr_accessor :attribute_types_cached_by_default, instance_accessor: false end diff --git a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb index 95bbf68433..f36a5806a9 100644 --- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb +++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb @@ -1,6 +1,6 @@ module ActiveRecord - ActiveSupport.on_load(:active_record_model) do + ActiveSupport.on_load(:active_record_config) do mattr_accessor :time_zone_aware_attributes, instance_accessor: false self.time_zone_aware_attributes = false |