aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-09-03 19:33:15 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-09-03 19:33:15 +0000
commitf71080a4754b909f3b9e5deecfb46f764df7e8df (patch)
tree4f274e1e72220099f5c8214d5a82746a5d7c28fe /activesupport
parent4fc6c872ef1f6ae10eec7c24cbc60697336ca707 (diff)
downloadrails-f71080a4754b909f3b9e5deecfb46f764df7e8df.tar.gz
rails-f71080a4754b909f3b9e5deecfb46f764df7e8df.tar.bz2
rails-f71080a4754b909f3b9e5deecfb46f764df7e8df.zip
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
Diffstat (limited to 'activesupport')
-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 = []