diff options
| author | Xavier Noria <fxn@hashref.com> | 2013-11-14 01:03:10 -0800 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2013-11-14 01:03:10 -0800 |
| commit | 436a9c1b85ffccf8ab3cbe6171a9196fa9e08476 (patch) | |
| tree | dc52dd7cd0f8b090e75697a847b0450455175714 | |
| parent | c576e24e0e589703eac48dc06fe48a24d9cf8e18 (diff) | |
| parent | 1e62457a6d4307edc026591f8c8a8335d9627768 (diff) | |
| download | rails-436a9c1b85ffccf8ab3cbe6171a9196fa9e08476.tar.gz rails-436a9c1b85ffccf8ab3cbe6171a9196fa9e08476.tar.bz2 rails-436a9c1b85ffccf8ab3cbe6171a9196fa9e08476.zip | |
Merge pull request #12861 from route/missed_require_for_module
Clean up `require ‘active_support/deprecation’` and remove circular require
| -rw-r--r-- | activesupport/lib/active_support/all.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/module/deprecation.rb | 2 |
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' |