diff options
| author | Richard Schneeman <richard.schneeman+no-recruiters@gmail.com> | 2017-06-27 19:41:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-27 19:41:11 -0500 |
| commit | d766b64b7e137955b7c7dbab51d2b6e525de47c1 (patch) | |
| tree | 40486920d4b81daab0b89a2bd16ec6384c5deba6 /actionpack/lib | |
| parent | 029c50735ba9a882ba67dd8219d61cf8698d6133 (diff) | |
| parent | 2c0300389c3f6be00bf6c6b806332808a9400429 (diff) | |
| download | rails-d766b64b7e137955b7c7dbab51d2b6e525de47c1.tar.gz rails-d766b64b7e137955b7c7dbab51d2b6e525de47c1.tar.bz2 rails-d766b64b7e137955b7c7dbab51d2b6e525de47c1.zip | |
Merge pull request #29533 from jdelStrother/missing_url_formats
Fix missing formats in route-set URLs
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index e1f9fc9ecc..68bd6d806b 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -279,6 +279,8 @@ module ActionDispatch if args.size < path_params_size path_params -= controller_options.keys path_params -= result.keys + else + path_params = path_params.dup end inner_options.each_key do |key| path_params.delete(key) |