diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-02 22:36:21 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-02 22:36:21 -0200 |
| commit | 46923cabe156852bac1ae99c4509ff2780eae2a1 (patch) | |
| tree | 494992d285acdbd44742c5c932be6526580f6941 /activesupport | |
| parent | d7d11f0dab7f2875d04c17921e12fe62ac6e9566 (diff) | |
| parent | 45f70dca7bbd822604941d0486e4a120882afcde (diff) | |
| download | rails-46923cabe156852bac1ae99c4509ff2780eae2a1.tar.gz rails-46923cabe156852bac1ae99c4509ff2780eae2a1.tar.bz2 rails-46923cabe156852bac1ae99c4509ff2780eae2a1.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'activesupport')
| -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' |