aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-08-10 11:39:41 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-08-10 11:39:41 -0700
commit6a9d1925dc3fc1d54470cb548a595698429a1047 (patch)
tree653cc99af1f012ca03eda45a66d7970d9d2c1250 /actionpack
parent942f41263152277dd5d23744a97a67e8c1a8d3d4 (diff)
downloadrails-6a9d1925dc3fc1d54470cb548a595698429a1047.tar.gz
rails-6a9d1925dc3fc1d54470cb548a595698429a1047.tar.bz2
rails-6a9d1925dc3fc1d54470cb548a595698429a1047.zip
we have the resource on the stack, so just use it
We don't need to ask `scope` for the resource because we already have it right here.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb2
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 ab13fb14ce..c93a64fcf4 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1692,7 +1692,7 @@ module ActionDispatch
@nesting.push(resource)
with_scope_level(kind) do
- controller_scope(parent_resource.resource_scope) { yield }
+ controller_scope(resource.resource_scope) { yield }
end
ensure
@nesting.pop