diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2014-12-13 19:03:30 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2014-12-13 19:03:30 -0200 |
| commit | ef99d4cd3ecc58a8c1484740b2fb5447dbda23ab (patch) | |
| tree | 7c706dd5785c4101614a29fb7808df1294551079 /actionpack/lib/action_dispatch/routing | |
| parent | 390f09efa3850d735bb9426a4a41a81f8ea400d2 (diff) | |
| parent | a842c5c12d4c1091c4e065cbdbc3adb58ce55bc9 (diff) | |
| download | rails-ef99d4cd3ecc58a8c1484740b2fb5447dbda23ab.tar.gz rails-ef99d4cd3ecc58a8c1484740b2fb5447dbda23ab.tar.bz2 rails-ef99d4cd3ecc58a8c1484740b2fb5447dbda23ab.zip | |
Merge pull request #18022 from agrobbin/url-helpers-optional-scopes
Allow URL helpers to work with optional scopes
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 34cd06fd58..d7693bdcee 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -293,7 +293,7 @@ module ActionDispatch path_params -= result.keys end path_params.each { |param| - result[param] = inner_options[param] || args.shift + result[param] = inner_options.fetch(param) { args.shift } } end |