diff options
| author | brainopia <brainopia@evilmartians.com> | 2015-01-08 02:53:57 +0300 |
|---|---|---|
| committer | brainopia <brainopia@evilmartians.com> | 2015-01-08 02:53:57 +0300 |
| commit | f9e2496872bcd34aa7c6083b1763322b47fba6a3 (patch) | |
| tree | b0a058a64fa84f92b8943260d7cb7b8116c98cc1 /actionpack/lib | |
| parent | 5d28c6b5b8407abf9274f78502d387c98f209286 (diff) | |
| download | rails-f9e2496872bcd34aa7c6083b1763322b47fba6a3.tar.gz rails-f9e2496872bcd34aa7c6083b1763322b47fba6a3.tar.bz2 rails-f9e2496872bcd34aa7c6083b1763322b47fba6a3.zip | |
Correct route requirements by overriding defaultls (fixes #18373)
Diffstat (limited to 'actionpack/lib')
| -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 |