Skip to content

Commit

Permalink
Made it clear that deprecated stuff leaves on majors only
Browse files Browse the repository at this point in the history
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4926 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information
dhh committed Sep 3, 2006
1 parent 4fc6c87 commit f71080a
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions activesupport/lib/active_support/deprecation.rb
Expand Up @@ -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

Expand Down Expand Up @@ -78,7 +78,6 @@ def assert_not_deprecated(&block)
end

private

def collect_deprecations
old_behavior = ActiveSupport::Deprecation.behavior
deprecations = []
Expand Down

0 comments on commit f71080a

Please sign in to comment.