diff options
| author | Arthur Nogueira Neves <github@arthurnn.com> | 2015-04-27 09:15:22 -0400 |
|---|---|---|
| committer | Arthur Nogueira Neves <github@arthurnn.com> | 2015-04-27 09:15:22 -0400 |
| commit | 86929c00c03a4035fc3f4b0f713b806c619674b9 (patch) | |
| tree | 8c828c534cda12b2901054b88b48531b8464d324 /actionpack/lib/action_dispatch/journey | |
| parent | f00554a8226b9529c38be1f3e61b6b1888682fb4 (diff) | |
| parent | f9e2496872bcd34aa7c6083b1763322b47fba6a3 (diff) | |
| download | rails-86929c00c03a4035fc3f4b0f713b806c619674b9.tar.gz rails-86929c00c03a4035fc3f4b0f713b806c619674b9.tar.bz2 rails-86929c00c03a4035fc3f4b0f713b806c619674b9.zip | |
Merge pull request #18392 from brainopia/fix_route_requirements
Correct route requirements by overriding defaultls
Diffstat (limited to 'actionpack/lib/action_dispatch/journey')
| -rw-r--r-- | actionpack/lib/action_dispatch/journey/route.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/journey/route.rb b/actionpack/lib/action_dispatch/journey/route.rb index 4d5c18984a..4698ff8cc7 100644 --- a/actionpack/lib/action_dispatch/journey/route.rb +++ b/actionpack/lib/action_dispatch/journey/route.rb @@ -36,7 +36,7 @@ module ActionDispatch def requirements # :nodoc: # needed for rails `rake routes` - path.requirements.merge(@defaults).delete_if { |_,v| + @defaults.merge(path.requirements).delete_if { |_,v| /.+?/ == v } end |