aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-08-28 10:33:40 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-08-28 10:33:40 -0700
commit6d86762fd8f83896a6932614e9ac9bdc42102805 (patch)
tree99c6b463c7b7c90a5a5ca36ab5cba623d4d49031 /actionpack/lib/action_dispatch
parent8c52480ba6071a12b97f124d9f21df2c39df3ed3 (diff)
parentd78f3f0ec33d57e78249d5b96f38401a1c239410 (diff)
downloadrails-6d86762fd8f83896a6932614e9ac9bdc42102805.tar.gz
rails-6d86762fd8f83896a6932614e9ac9bdc42102805.tar.bz2
rails-6d86762fd8f83896a6932614e9ac9bdc42102805.zip
Merge pull request #16637 from Agis-/redirect-with-constraint-route
Fix the router ignoring constraints when used together with a redirect route
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index e92baa5aa7..fc28740828 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -241,8 +241,6 @@ module ActionDispatch
end
def app(blocks)
- return to if Redirect === to
-
if to.respond_to?(:call)
Constraints.new(to, blocks, false)
else