Merge pull request #7650 from kennyj/fix_warning_20120915
Fix warning: circular require considered harmful.
This commit is contained in:
commit
e0deb0e89b
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user