diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-24 15:27:46 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-24 15:27:46 -0700 |
| commit | 643cac08a325243cab21d870c68a9c4088c58380 (patch) | |
| tree | a4c4e006015254e7a8249ce323739511340535ec /actionpack/lib/action_dispatch/routing/mapper.rb | |
| parent | edc2b7718725016e988089b5fb6d6fb9d6e16882 (diff) | |
| parent | 8ca8a2d773b942c4ea76baabe2df502a339d05b1 (diff) | |
| download | rails-643cac08a325243cab21d870c68a9c4088c58380.tar.gz rails-643cac08a325243cab21d870c68a9c4088c58380.tar.bz2 rails-643cac08a325243cab21d870c68a9c4088c58380.zip | |
Merge pull request #23103 from rails/refactor-handling-of-action-default
Refactor handling of :action default in routing
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index ffd5b83ad3..faa93ecc17 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -137,6 +137,10 @@ module ActionDispatch @conditions = Hash[conditions] @defaults = formats[:defaults].merge(@defaults).merge(normalize_defaults(options)) + if path_params.include?(:action) && !@requirements.key?(:action) + @defaults[:action] ||= 'index' + end + @required_defaults = (split_options[:required_defaults] || []).map(&:first) end |