diff options
author | Genadi Samokovarov <gsamokovarov@gmail.com> | 2013-12-02 23:36:58 +0200 |
---|---|---|
committer | Genadi Samokovarov <gsamokovarov@gmail.com> | 2013-12-03 00:28:15 +0200 |
commit | 6329d9fa8b2f86a178151be264cccdb805bfaaac (patch) | |
tree | 1c793198a080d1853b93d8145e18c3fea9be33fc /activerecord | |
parent | afbefccf2a8a2b252fe3fd9565b732f9e0867a08 (diff) | |
download | rails-6329d9fa8b2f86a178151be264cccdb805bfaaac.tar.gz rails-6329d9fa8b2f86a178151be264cccdb805bfaaac.tar.bz2 rails-6329d9fa8b2f86a178151be264cccdb805bfaaac.zip |
Remove deprecated cattr_* requires
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/base.rb | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/migration.rb | 2 |
2 files changed, 2 insertions, 2 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' diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index a4247fb6f4..f7e0a388d7 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -1,4 +1,4 @@ -require "active_support/core_ext/class/attribute_accessors" +require "active_support/core_ext/module/attribute_accessors" require 'set' module ActiveRecord |