Merge pull request #12861 from route/missed_require_for_module

Clean up `require ‘active_support/deprecation’` and remove circular require
2013-11-14 01:03:10 -08:00 · 2013-11-14 01:03:10 -08:00 · 436a9c1b85
commit 436a9c1b85
parent c576e24e0e 1e62457a6d
2 changed files with 0 additions and 3 deletions
--- a/activesupport/lib/active_support/all.rb
+++ b/activesupport/lib/active_support/all.rb
@ -1,4 +1,3 @@
 require 'active_support'
-require 'active_support/deprecation'
 require 'active_support/time'
 require 'active_support/core_ext'
--- a/activesupport/lib/active_support/core_ext/module/deprecation.rb
+++ b/activesupport/lib/active_support/core_ext/module/deprecation.rb
@ -1,5 +1,3 @@
-require 'active_support/deprecation/method_wrappers'
-
 class Module
  #   deprecate :foo
  #   deprecate bar: 'message'