diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-14 09:19:22 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-14 10:39:32 -0700 |
| commit | 715abbbb33a0715b5b8476132b7fd7c20b9e0df1 (patch) | |
| tree | 7566dbc30ea6a23b6525b027cd98877912f95205 /actionpack/lib/action_dispatch | |
| parent | 1eb6b4a679b05e443792430f11f084746005f6ff (diff) | |
| download | rails-715abbbb33a0715b5b8476132b7fd7c20b9e0df1.tar.gz rails-715abbbb33a0715b5b8476132b7fd7c20b9e0df1.tar.bz2 rails-715abbbb33a0715b5b8476132b7fd7c20b9e0df1.zip | |
stop adding path_info to the conditions hash
we don't need to keep adding it and deleting if from hashes.
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -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) |