From f71080a4754b909f3b9e5deecfb46f764df7e8df Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 3 Sep 2006 19:33:15 +0000 Subject: [PATCH] Made it clear that deprecated stuff leaves on majors only git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4926 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activesupport/lib/active_support/deprecation.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 = []