aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activesupport/lib/active_support/deprecation.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/deprecation.rb b/activesupport/lib/active_support/deprecation.rb
index 99dbad1f7e..0f1d6e9b8b 100644
--- a/activesupport/lib/active_support/deprecation.rb
+++ b/activesupport/lib/active_support/deprecation.rb
@@ -34,7 +34,7 @@ module ActiveSupport
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 @@ module ActiveSupport
end
private
-
def collect_deprecations
old_behavior = ActiveSupport::Deprecation.behavior
deprecations = []