From ab30570b69e6118bbfbd8dfaa7577668b34e5eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 9 Dec 2011 20:47:33 +0100
Subject: Fix extend -> include.

---
 actionpack/lib/abstract_controller/logger.rb | 2 +-
 actionpack/lib/action_controller/base.rb     | 2 --
 2 files changed, 1 insertion(+), 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,
-- 
cgit v1.2.3