aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb10
1 files changed, 3 insertions, 7 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index bcc0e6fe9f..887b5957df 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -126,8 +126,9 @@ module ActionDispatch
@conditions[:required_defaults] = (split_options[:required_defaults] || []).map(&:first)
@conditions[:path_info] = path
@conditions[:parsed_path_info] = ast
-
- add_request_method(via, @conditions)
+ unless via == [:all]
+ @conditions[:request_method] = via.map { |m| m.to_s.dasherize.upcase }
+ end
end
def to_route
@@ -222,11 +223,6 @@ module ActionDispatch
Hash[options.reject { |_, default| Regexp === default }]
end
- def add_request_method(via, conditions)
- return if via == [:all]
- conditions[:request_method] = via.map { |m| m.to_s.dasherize.upcase }
- end
-
def app(blocks)
if to.respond_to?(:call)
Constraints.new(to, blocks, Constraints::CALL)