aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2011-11-18 22:42:14 -0800
committerYehuda Katz <wycats@gmail.com>2011-11-18 22:42:14 -0800
commit89bbb6ce21324838d16afc1ea7220167fc3c80d8 (patch)
treebac5fa6f04e96bfa8de94b248782340b10fb654d
parent396ef44be48dbcbc75d313980d0ba272a6200099 (diff)
parentd806ea20506f824efbe2c8b69928929977cc3a59 (diff)
downloadrails-89bbb6ce21324838d16afc1ea7220167fc3c80d8.tar.gz
rails-89bbb6ce21324838d16afc1ea7220167fc3c80d8.tar.bz2
rails-89bbb6ce21324838d16afc1ea7220167fc3c80d8.zip
Merge pull request #3689 from arunagw/warning_removed_actionpack
Warning removed for shadowing variable
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 21624bcfc2..e3ad3f9ba7 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1252,7 +1252,7 @@ module ActionDispatch
raise ArgumentError, "Unknown scope #{on.inspect} given to :on"
end
- paths.each { |path| decomposed_match(path, options.dup) }
+ paths.each { |_path| decomposed_match(_path, options.dup) }
self
end