aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-09-14 01:00:52 -0700
committerJosé Valim <jose.valim@plataformatec.com.br>2012-09-14 01:00:52 -0700
commit84ba499b1645230dd90f46fa63e5d071ada49f37 (patch)
treed7e83698aac1b7ecf179a814078f557ea9850b6d
parent40937fe5192853b0234a4c8b04e91a402e957710 (diff)
parent948a055f2375fa17ea5aa1cc2b81a226a4660598 (diff)
downloadrails-84ba499b1645230dd90f46fa63e5d071ada49f37.tar.gz
rails-84ba499b1645230dd90f46fa63e5d071ada49f37.tar.bz2
rails-84ba499b1645230dd90f46fa63e5d071ada49f37.zip
Merge pull request #7635 from arunagw/warning_removed_shadowing_variable
warning removed: shadowing outer local variable - message
-rw-r--r--activesupport/lib/active_support/deprecation/reporting.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/deprecation/reporting.rb b/activesupport/lib/active_support/deprecation/reporting.rb
index 02e8ff7c87..43a4ed81e5 100644
--- a/activesupport/lib/active_support/deprecation/reporting.rb
+++ b/activesupport/lib/active_support/deprecation/reporting.rb
@@ -35,8 +35,8 @@ module ActiveSupport
end
def deprecation_warning(deprecated_method_name, message = nil, caller_backtrace = caller)
- deprecated_method_warning(deprecated_method_name, message).tap do |message|
- warn(message, caller_backtrace)
+ deprecated_method_warning(deprecated_method_name, message).tap do |msg|
+ warn(msg, caller_backtrace)
end
end