diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-09 20:47:33 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-09 21:42:18 +0100 |
| commit | ab30570b69e6118bbfbd8dfaa7577668b34e5eaf (patch) | |
| tree | a3bb7b874950ae2f65273fe4180de4abb529e33f | |
| parent | 5b82f50feff3c80cbe7a7ae33b078baa1515150a (diff) | |
| download | rails-ab30570b69e6118bbfbd8dfaa7577668b34e5eaf.tar.gz rails-ab30570b69e6118bbfbd8dfaa7577668b34e5eaf.tar.bz2 rails-ab30570b69e6118bbfbd8dfaa7577668b34e5eaf.zip | |
Fix extend -> include.
| -rw-r--r-- | actionpack/lib/abstract_controller/logger.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/abstract_controller/logger.rb b/actionpack/lib/abstract_controller/logger.rb index 0b196119f4..8b36230397 100644 --- a/actionpack/lib/abstract_controller/logger.rb +++ b/actionpack/lib/abstract_controller/logger.rb @@ -7,7 +7,7 @@ module AbstractController included do config_accessor :logger - extend ActiveSupport::Benchmarkable + include ActiveSupport::Benchmarkable end end end diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 335b4e8cb8..98bfe72fef 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -208,8 +208,6 @@ 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, |