diff options
author | Xavier Noria <fxn@hashref.com> | 2011-05-01 11:16:31 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-05-01 11:16:31 +0200 |
commit | 2fbf302149cf40c791ca1207a5f984cf58903397 (patch) | |
tree | 5da770d0fd31520a6264a9864b1db1412646d100 /activesupport/lib/active_support/deprecation | |
parent | a0656989c47c29c87c4f243ce3695c39777c67b8 (diff) | |
parent | b84b759ec60b5005fea183186639408fcf903450 (diff) | |
download | rails-2fbf302149cf40c791ca1207a5f984cf58903397.tar.gz rails-2fbf302149cf40c791ca1207a5f984cf58903397.tar.bz2 rails-2fbf302149cf40c791ca1207a5f984cf58903397.zip |
Merge branch 'master' of git://github.com/lifo/docrails
Conflicts:
railties/guides/source/contributing_to_ruby_on_rails.textile
Diffstat (limited to 'activesupport/lib/active_support/deprecation')
-rw-r--r-- | activesupport/lib/active_support/deprecation/reporting.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/deprecation/reporting.rb b/activesupport/lib/active_support/deprecation/reporting.rb index ced08b8783..5d7e241d1a 100644 --- a/activesupport/lib/active_support/deprecation/reporting.rb +++ b/activesupport/lib/active_support/deprecation/reporting.rb @@ -5,10 +5,8 @@ module ActiveSupport # Outputs a deprecation warning to the output configured by <tt>ActiveSupport::Deprecation.behavior</tt> # - # Example: - # # ActiveSupport::Deprecation.warn("something broke!") - # #=> "DEPRECATION WARNING: something broke! (called from your_code.rb:1)" + # # => "DEPRECATION WARNING: something broke! (called from your_code.rb:1)" def warn(message = nil, callstack = caller) return if silenced deprecation_message(callstack, message).tap do |m| |