aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-06-12 08:56:27 +0200
committerYves Senn <yves.senn@gmail.com>2014-06-12 08:56:27 +0200
commit2a7580e63cdcc9cf1c8837578b1d18602db2b74c (patch)
treec14d7dcbe3928dc9b4e6642791cf192f0cbd7795
parent5f9a2beffd1e8e3507468c70f74fe0da9cc9c5f7 (diff)
parent26ef4fce411bdcb94c3b2ed483cc884e2a6aab60 (diff)
downloadrails-2a7580e63cdcc9cf1c8837578b1d18602db2b74c.tar.gz
rails-2a7580e63cdcc9cf1c8837578b1d18602db2b74c.tar.bz2
rails-2a7580e63cdcc9cf1c8837578b1d18602db2b74c.zip
Merge pull request #15662 from JuanitoFatas/patch/remove-warning
Removed variable shawdowing warning in actionpack url.rb
-rw-r--r--actionpack/lib/action_dispatch/http/url.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index 75e426d3b0..92aba01b95 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -92,8 +92,8 @@ module ActionDispatch
end
result << host
- normalize_port(port, protocol) { |port|
- result << ":#{port}"
+ normalize_port(port, protocol) { |normalized_port|
+ result << ":#{normalized_port}"
}
result