Skip to content
Browse files

Make ActiveSupport::Benchmarkable a default module for ActionControll…

…er::Base, so the #benchmark method is once again available in the controller context like it used to be *DHH*
  • Loading branch information...
1 parent 929b264 commit 22a6079a20ae13dcb0ad6ddb3ee39a849e5e0928 @dhh dhh committed Dec 9, 2011
Showing with 4 additions and 0 deletions.
  1. +2 −0 actionpack/CHANGELOG.md
  2. +2 −0 actionpack/lib/action_controller/base.rb
View
2 actionpack/CHANGELOG.md
@@ -1,5 +1,7 @@
## Rails 3.2.0 (unreleased) ##
+* 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*
+
* Deprecated implied layout lookup in controllers whose parent had a explicit layout set:
class ApplicationController
View
2 actionpack/lib/action_controller/base.rb
@@ -208,6 +208,8 @@ def self.without_modules(*modules)
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,

0 comments on commit 22a6079

Please sign in to comment.
Something went wrong with that request. Please try again.