diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-02 14:30:39 -0800 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-12-02 14:30:39 -0800 |
| commit | b40faf423cb032cf326e07e7c7bd578c9052b282 (patch) | |
| tree | 7d64d3c5c711cda60f4949f491d4cf4d0046c8f4 /activesupport/lib | |
| parent | b0a3d113a306d6bdec1ed13261ef051d367c7160 (diff) | |
| parent | 6329d9fa8b2f86a178151be264cccdb805bfaaac (diff) | |
| download | rails-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 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/cache.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/logger.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb index 5c1d473161..d584d50da8 100644 --- a/activesupport/lib/active_support/cache.rb +++ b/activesupport/lib/active_support/cache.rb @@ -3,7 +3,7 @@ require 'zlib' require 'active_support/core_ext/array/extract_options' require 'active_support/core_ext/array/wrap' require 'active_support/core_ext/benchmark' -require 'active_support/core_ext/class/attribute_accessors' +require 'active_support/core_ext/module/attribute_accessors' require 'active_support/core_ext/numeric/bytes' require 'active_support/core_ext/numeric/time' require 'active_support/core_ext/object/to_param' diff --git a/activesupport/lib/active_support/logger.rb b/activesupport/lib/active_support/logger.rb index 4a55bbb350..33fccdcf95 100644 --- a/activesupport/lib/active_support/logger.rb +++ b/activesupport/lib/active_support/logger.rb @@ -1,4 +1,4 @@ -require 'active_support/core_ext/class/attribute_accessors' +require 'active_support/core_ext/module/attribute_accessors' require 'active_support/logger_silence' require 'logger' |