aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 52519188a9..1264e7e00b 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1106,7 +1106,7 @@ module ActionDispatch
end
def resource_scope
- { :controller => controller }
+ controller
end
alias :collection_scope :path
@@ -1684,7 +1684,7 @@ module ActionDispatch
@nesting.push(resource)
with_scope_level(kind) do
- controller_scope(parent_resource.resource_scope[:controller]) { yield }
+ controller_scope(parent_resource.resource_scope) { yield }
end
ensure
@nesting.pop