diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-10-07 02:42:36 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-10-07 02:42:36 -0700 |
| commit | e0deb0e89b15d2d7fc3b5a19f8a9969895479891 (patch) | |
| tree | e893c8ae696a26d3409ff6b79f2b8161825e1376 /activesupport/lib | |
| parent | 283949f79ec73b39f862b90dbc892228f608a809 (diff) | |
| parent | 8b05cfad113807d4545fccff303446305ab093df (diff) | |
| download | rails-e0deb0e89b15d2d7fc3b5a19f8a9969895479891.tar.gz rails-e0deb0e89b15d2d7fc3b5a19f8a9969895479891.tar.bz2 rails-e0deb0e89b15d2d7fc3b5a19f8a9969895479891.zip | |
Merge pull request #7650 from kennyj/fix_warning_20120915
Fix warning: circular require considered harmful.
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/deprecation.rb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/activesupport/lib/active_support/deprecation.rb b/activesupport/lib/active_support/deprecation.rb index b3f5fde335..b732c17e0f 100644 --- a/activesupport/lib/active_support/deprecation.rb +++ b/activesupport/lib/active_support/deprecation.rb @@ -1,15 +1,16 @@ -require 'active_support/core_ext/module/deprecation' -require 'active_support/deprecation/instance_delegator' -require 'active_support/deprecation/behaviors' -require 'active_support/deprecation/reporting' -require 'active_support/deprecation/method_wrappers' -require 'active_support/deprecation/proxy_wrappers' require 'singleton' module ActiveSupport # \Deprecation specifies the API used by Rails to deprecate methods, instance # variables, objects and constants. class Deprecation + require 'active_support/deprecation/instance_delegator' + require 'active_support/deprecation/behaviors' + require 'active_support/deprecation/reporting' + require 'active_support/deprecation/method_wrappers' + require 'active_support/deprecation/proxy_wrappers' + require 'active_support/core_ext/module/deprecation' + include Singleton include InstanceDelegator include Behavior |