From 4ed156336faaa378e0329f4e96c3f4c30ddaee09 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sat, 20 Oct 2012 11:35:16 -0700 Subject: Revert "Get rid of the ActiveRecord::Model::DeprecationProxy thing." This reverts commit 83846838252397b3781eed165ca301e05db39293. --- activerecord/lib/active_record/serialization.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/serialization.rb') diff --git a/activerecord/lib/active_record/serialization.rb b/activerecord/lib/active_record/serialization.rb index 6bdf0db95a..e8dd312a47 100644 --- a/activerecord/lib/active_record/serialization.rb +++ b/activerecord/lib/active_record/serialization.rb @@ -1,5 +1,5 @@ module ActiveRecord #:nodoc: - ActiveSupport.on_load(:active_record_model) do + ActiveSupport.on_load(:active_record_config) do mattr_accessor :include_root_in_json, instance_accessor: false self.include_root_in_json = true end -- cgit v1.2.3