aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 2cbf6cef90..654eabaa96 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -28,7 +28,7 @@ module ActionDispatch
def serve(req)
params = req.path_parameters
- controller = controller_reference(req) do
+ controller = req.controller_class do
return [404, {'X-Cascade' => 'pass'}, []]
end
dispatch(controller, params[:action], req)
@@ -40,11 +40,6 @@ module ActionDispatch
end
end
- protected
- def controller_reference(req, &block)
- req.controller_class(&block)
- end
-
private
def dispatch(controller, action, req)