diff options
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 1 |
2 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 8a90c40d2b..51d4ebb5c4 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -135,7 +135,6 @@ module ActionDispatch @defaults = formats[:defaults].merge(@defaults).merge(normalize_defaults(options)) @conditions[:required_defaults] = (split_options[:required_defaults] || []).map(&:first) - @conditions[:path_info] = path @conditions[:parsed_path_info] = ast unless via == [:all] @conditions[:request_method] = via.map { |m| m.to_s.dasherize.upcase } diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 279cbd232b..a3cadec68f 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -525,7 +525,6 @@ module ActionDispatch "http://guides.rubyonrails.org/routing.html#restricting-the-routes-created" end - path = conditions.delete :path_info ast = conditions.delete :parsed_path_info required_defaults = conditions.delete :required_defaults path = build_path(ast, requirements, anchor) |