aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2012-04-27 05:58:26 -0700
committerJon Leighton <j@jonathanleighton.com>2012-04-27 05:58:26 -0700
commita6e47b2811508f6d6b49846c473f6fe86ef9bf9c (patch)
treef96ac780eb35279ab799b50b7ad67ce3baa6972f
parent20ea8df6b5ba430cb4947a583faa22543cc9f20a (diff)
parent68aadbc23a2dcb20fc4b0acd0838c7466c61930c (diff)
downloadrails-a6e47b2811508f6d6b49846c473f6fe86ef9bf9c.tar.gz
rails-a6e47b2811508f6d6b49846c473f6fe86ef9bf9c.tar.bz2
rails-a6e47b2811508f6d6b49846c473f6fe86ef9bf9c.zip
Merge pull request #5989 from arunagw/warning_removed_master_ap
Shadowing variable warning removed
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 716e2d2271..1a1a054985 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1306,14 +1306,14 @@ module ActionDispatch
end
def draw(name)
- path = @draw_paths.find do |path|
- path.join("#{name}.rb").file?
+ path = @draw_paths.find do |_path|
+ _path.join("#{name}.rb").file?
end
unless path
msg = "Your router tried to #draw the external file #{name}.rb,\n" \
"but the file was not found in:\n\n"
- msg += @draw_paths.map { |path| " * #{path}" }.join("\n")
+ msg += @draw_paths.map { |_path| " * #{_path}" }.join("\n")
raise msg
end