aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/base.rb
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-12-02 14:30:39 -0800
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-12-02 14:30:39 -0800
commitb40faf423cb032cf326e07e7c7bd578c9052b282 (patch)
tree7d64d3c5c711cda60f4949f491d4cf4d0046c8f4 /activerecord/lib/active_record/base.rb
parentb0a3d113a306d6bdec1ed13261ef051d367c7160 (diff)
parent6329d9fa8b2f86a178151be264cccdb805bfaaac (diff)
downloadrails-b40faf423cb032cf326e07e7c7bd578c9052b282.tar.gz
rails-b40faf423cb032cf326e07e7c7bd578c9052b282.tar.bz2
rails-b40faf423cb032cf326e07e7c7bd578c9052b282.zip
Merge pull request #13138 from gsamokovarov/remove-cattr-requires
Remove deprecated cattr_* requires
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rw-r--r--activerecord/lib/active_record/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index e05e22ebb0..1d3ec75aa1 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -4,7 +4,7 @@ require 'active_support/benchmarkable'
require 'active_support/dependencies'
require 'active_support/descendants_tracker'
require 'active_support/time'
-require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/core_ext/module/attribute_accessors'
require 'active_support/core_ext/class/delegating_attributes'
require 'active_support/core_ext/array/extract_options'
require 'active_support/core_ext/hash/deep_merge'