From 654dd04af61727e94b293b6713d8775b8d8ad630 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Wed, 2 Apr 2014 13:17:21 -0300 Subject: Move require to actual file Change to require all active_support/deprecation since that's the actual entry point for the deprecation methods. --- activesupport/lib/active_support/core_ext/string/output_safety.rb | 1 + activesupport/test/core_ext/string_ext_test.rb | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'activesupport') 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' -- cgit v1.2.3