From 22a6079a20ae13dcb0ad6ddb3ee39a849e5e0928 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 9 Dec 2011 18:15:28 +0100 Subject: Make ActiveSupport::Benchmarkable a default module for ActionController::Base, so the #benchmark method is once again available in the controller context like it used to be *DHH* --- actionpack/lib/action_controller/base.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 98bfe72fef..335b4e8cb8 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -208,6 +208,8 @@ module ActionController HttpAuthentication::Digest::ControllerMethods, HttpAuthentication::Token::ControllerMethods, + ActiveSupport::Benchmarkable, + # Before callbacks should also be executed the earliest as possible, so # also include them at the bottom. AbstractController::Callbacks, -- cgit v1.2.3