aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-06-08 17:23:14 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-06-08 17:23:14 -0700
commit877c133855c8f26f8f250103aba8c458a787d39b (patch)
tree9f8b08c8fd86e2e93ad84f17cd2af869624ba4b4 /actionpack/lib/action_dispatch/routing
parent8037d7eacd14376d2c093d27f5b7d18fed085916 (diff)
downloadrails-877c133855c8f26f8f250103aba8c458a787d39b.tar.gz
rails-877c133855c8f26f8f250103aba8c458a787d39b.tar.bz2
rails-877c133855c8f26f8f250103aba8c458a787d39b.zip
we only care about methods that the request object responds to
matches? should only deal with methods on the request object, so lets just filter out anything that the request object doesn't respond to
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 1e950d13f8..49473ecd6f 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -564,8 +564,7 @@ module ActionDispatch
end
conditions.keep_if do |k, _|
- k == :action || k == :controller ||
- request_class.public_method_defined?(k) || path_values.include?(k)
+ request_class.public_method_defined?(k)
end
end
private :build_conditions