Skip to content
This repository
Browse code

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...
commit 22a6079a20ae13dcb0ad6ddb3ee39a849e5e0928 1 parent 929b264
David Heinemeier Hansson dhh authored
2  actionpack/CHANGELOG.md
Source Rendered
... ... @@ -1,5 +1,7 @@
1 1 ## Rails 3.2.0 (unreleased) ##
2 2
  3 +* 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*
  4 +
3 5 * Deprecated implied layout lookup in controllers whose parent had a explicit layout set:
4 6
5 7 class ApplicationController
2  actionpack/lib/action_controller/base.rb
@@ -208,6 +208,8 @@ def self.without_modules(*modules)
208 208 HttpAuthentication::Digest::ControllerMethods,
209 209 HttpAuthentication::Token::ControllerMethods,
210 210
  211 + ActiveSupport::Benchmarkable,
  212 +
211 213 # Before callbacks should also be executed the earliest as possible, so
212 214 # also include them at the bottom.
213 215 AbstractController::Callbacks,

0 comments on commit 22a6079

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