diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-12 14:16:11 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-12 14:30:53 -0700 |
| commit | b106dddfaf5eb34dee9eac8e8e01c02b24c3ea43 (patch) | |
| tree | 15ed3545590eea7511d38603a752ec1ff8a08950 /actionpack | |
| parent | 4c641c6e362238afbe76b9a1c9d06339f2a805c4 (diff) | |
| download | rails-b106dddfaf5eb34dee9eac8e8e01c02b24c3ea43.tar.gz rails-b106dddfaf5eb34dee9eac8e8e01c02b24c3ea43.tar.bz2 rails-b106dddfaf5eb34dee9eac8e8e01c02b24c3ea43.zip | |
fix via handling when it's in a scope
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 4f1c73764f..64a0bad38b 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -1605,7 +1605,7 @@ module ActionDispatch name_for_action(options.delete(:as), action) end - via = Array(options.delete(:via) { [] }) + via = Array(options.delete(:via) { (@scope[:options] || {})[:via] }) mapping = Mapping.build(@scope, @set, URI.parser.escape(path), as, controller, default_action, to, via, options) app, conditions, requirements, defaults, as, anchor = mapping.to_route @set.add_route(app, conditions, requirements, defaults, as, anchor) |