diff --git a/activesupport/lib/active_support/deprecation.rb b/activesupport/lib/active_support/deprecation.rb index 99dbad1f7e25b..0f1d6e9b8b5bf 100644 --- a/activesupport/lib/active_support/deprecation.rb +++ b/activesupport/lib/active_support/deprecation.rb @@ -34,7 +34,7 @@ def silence private def deprecation_message(callstack, message = nil) file, line, method = extract_callstack(callstack) - message ||= "WARNING: #{method} is deprecated and will be removed from the next Rails release" + message ||= "WARNING: #{method} is deprecated and will be removed from the next major Rails release (2.0)" "#{message} (#{method} at #{file}:#{line})" end @@ -78,7 +78,6 @@ def assert_not_deprecated(&block) end private - def collect_deprecations old_behavior = ActiveSupport::Deprecation.behavior deprecations = []