Permalink
Browse files

Merge pull request #7650 from kennyj/fix_warning_20120915

Fix warning: circular require considered harmful.
  • Loading branch information...
2 parents 283949f + 8b05cfa commit e0deb0e89b15d2d7fc3b5a19f8a9969895479891 @fxn fxn committed Oct 7, 2012
Showing with 7 additions and 6 deletions.
  1. +7 −6 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

0 comments on commit e0deb0e

Please sign in to comment.