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/inspector.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/inspector.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/inspector.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/inspector.rb b/actionpack/lib/action_dispatch/routing/inspector.rb index 5d30a545a2..2459a45827 100644 --- a/actionpack/lib/action_dispatch/routing/inspector.rb +++ b/actionpack/lib/action_dispatch/routing/inspector.rb @@ -33,11 +33,11 @@ module ActionDispatch end def controller - requirements[:controller] || ':controller' + parts.include?(:controller) ? ':controller' : requirements[:controller] end def action - requirements[:action] || ':action' + parts.include?(:action) ? ':action' : requirements[:action] end def internal? |