aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing/route_set.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-05-24 18:53:30 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-05-24 18:53:30 -0700
commit229c9ed89658cabd74764b7f5a2509bee33d364c (patch)
tree0212326aca952cc4d41957b4be4cae438061070b /actionpack/lib/action_dispatch/routing/route_set.rb
parent98c7fe87690ca4de6c46e8f69806e82e3f8af42d (diff)
downloadrails-229c9ed89658cabd74764b7f5a2509bee33d364c.tar.gz
rails-229c9ed89658cabd74764b7f5a2509bee33d364c.tar.bz2
rails-229c9ed89658cabd74764b7f5a2509bee33d364c.zip
Always construct route objects with Constraint objects
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/route_set.rb')
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 924455bce2..f36453020f 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -704,7 +704,7 @@ module ActionDispatch
old_params = req.path_parameters
req.path_parameters = old_params.merge params
dispatcher = route.app
- if dispatcher.is_a?(Mapper::Constraints) && dispatcher.matches?(env)
+ if dispatcher.matches?(env)
dispatcher = dispatcher.app
end