aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorDmitry Vorotilin <d.vorotilin@gmail.com>2013-11-12 11:44:09 +0400
committerDmitry Vorotilin <d.vorotilin@gmail.com>2013-11-14 12:59:56 +0400
commit1e62457a6d4307edc026591f8c8a8335d9627768 (patch)
tree5f101ca25463911f97419399d8dae9cd0cd5ecd4 /activesupport/lib/active_support
parent48ea0899074629203d84e2aea02593e893b5a2a4 (diff)
downloadrails-1e62457a6d4307edc026591f8c8a8335d9627768.tar.gz
rails-1e62457a6d4307edc026591f8c8a8335d9627768.tar.bz2
rails-1e62457a6d4307edc026591f8c8a8335d9627768.zip
Clean up `require ‘active_support/deprecation’` and remove circular require
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/all.rb1
-rw-r--r--activesupport/lib/active_support/core_ext/module/deprecation.rb2
2 files changed, 0 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/all.rb b/activesupport/lib/active_support/all.rb
index 151008bbaa..f537818300 100644
--- 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'
diff --git a/activesupport/lib/active_support/core_ext/module/deprecation.rb b/activesupport/lib/active_support/core_ext/module/deprecation.rb
index d873de197f..56d670fbe8 100644
--- 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'