diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2011-12-09 18:15:28 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-12-09 18:17:57 +0100 |
| commit | 22a6079a20ae13dcb0ad6ddb3ee39a849e5e0928 (patch) | |
| tree | 1cb7b18a7ee6d286ee4b884ddb9a6a0202f52eb3 /actionpack/lib/action_controller/base.rb | |
| parent | 929b2646b606e639a127bdd17f1aad169a26e2c5 (diff) | |
| download | rails-22a6079a20ae13dcb0ad6ddb3ee39a849e5e0928.tar.gz rails-22a6079a20ae13dcb0ad6ddb3ee39a849e5e0928.tar.bz2 rails-22a6079a20ae13dcb0ad6ddb3ee39a849e5e0928.zip | |
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*
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 2 |
1 files changed, 2 insertions, 0 deletions
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, |