diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-04-02 13:17:21 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-04-02 13:17:21 -0300 |
| commit | 654dd04af61727e94b293b6713d8775b8d8ad630 (patch) | |
| tree | 51eec660db3019f7e26ed3702e8a3586e0762be8 | |
| parent | a9752dcfd15bcddfe7b6f7126f3a6e0ba5927c56 (diff) | |
| download | rails-654dd04af61727e94b293b6713d8775b8d8ad630.tar.gz rails-654dd04af61727e94b293b6713d8775b8d8ad630.tar.bz2 rails-654dd04af61727e94b293b6713d8775b8d8ad630.zip | |
Move require to actual file
Change to require all active_support/deprecation since that's the actual
entry point for the deprecation methods.
| -rw-r--r-- | activesupport/lib/active_support/core_ext/string/output_safety.rb | 1 | ||||
| -rw-r--r-- | activesupport/test/core_ext/string_ext_test.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb index 85cc75ff9a..2c8995be9a 100644 --- a/activesupport/lib/active_support/core_ext/string/output_safety.rb +++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb @@ -1,5 +1,6 @@ require 'erb' require 'active_support/core_ext/kernel/singleton_class' +require 'active_support/deprecation' class ERB module Util diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb index d761a0dbd8..ea12f1ced5 100644 --- a/activesupport/test/core_ext/string_ext_test.rb +++ b/activesupport/test/core_ext/string_ext_test.rb @@ -4,7 +4,6 @@ require 'abstract_unit' require 'inflector_test_cases' require 'constantize_test_cases' -require 'active_support/deprecation/reporting' require 'active_support/inflector' require 'active_support/core_ext/string' require 'active_support/time' |