aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/lib/action_dispatch/routing/inspector.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/routing/inspector.rb b/actionpack/lib/action_dispatch/routing/inspector.rb
index 1ca2a3b683..115ec98ea9 100644
--- a/actionpack/lib/action_dispatch/routing/inspector.rb
+++ b/actionpack/lib/action_dispatch/routing/inspector.rb
@@ -83,11 +83,9 @@ module ActionDispatch
def normalize_filter(filter)
if filter.is_a?(Hash) && filter[:controller]
- {controller: /#{filter[:controller].downcase.sub(/_?controller\z/, '').sub('::', '/')}/}
- elsif filter.is_a?(String)
- {controller: /#{filter}/, action: /#{filter}/}
- else
- nil
+ { controller: /#{filter[:controller].downcase.sub(/_?controller\z/, '').sub('::', '/')}/ }
+ elsif filter
+ { controller: /#{filter}/, action: /#{filter}/ }
end
end