From 669fd84910586d4c791b6f5bf4320f68ac7845aa Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Fri, 29 May 2009 17:03:23 -0500
Subject: AS::Concern redefines "include" to lazy include modules as
 dependencies

---
 actionpack/lib/action_controller/abstract/benchmarker.rb | 2 +-
 actionpack/lib/action_controller/abstract/callbacks.rb   | 2 +-
 actionpack/lib/action_controller/abstract/helpers.rb     | 2 +-
 actionpack/lib/action_controller/abstract/layouts.rb     | 2 +-
 actionpack/lib/action_controller/abstract/renderer.rb    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'actionpack/lib/action_controller/abstract')

diff --git a/actionpack/lib/action_controller/abstract/benchmarker.rb b/actionpack/lib/action_controller/abstract/benchmarker.rb
index 6999329144..07294cede3 100644
--- a/actionpack/lib/action_controller/abstract/benchmarker.rb
+++ b/actionpack/lib/action_controller/abstract/benchmarker.rb
@@ -2,7 +2,7 @@ module AbstractController
   module Benchmarker
     extend ActiveSupport::Concern
 
-    depends_on Logger
+    include Logger
 
     module ClassMethods
       def benchmark(title, log_level = ::Logger::DEBUG, use_silence = true)
diff --git a/actionpack/lib/action_controller/abstract/callbacks.rb b/actionpack/lib/action_controller/abstract/callbacks.rb
index 6c67315c58..c6d3413c30 100644
--- a/actionpack/lib/action_controller/abstract/callbacks.rb
+++ b/actionpack/lib/action_controller/abstract/callbacks.rb
@@ -2,7 +2,7 @@ module AbstractController
   module Callbacks
     extend ActiveSupport::Concern
 
-    depends_on ActiveSupport::NewCallbacks
+    include ActiveSupport::NewCallbacks
 
     included do
       define_callbacks :process_action, "response_body"
diff --git a/actionpack/lib/action_controller/abstract/helpers.rb b/actionpack/lib/action_controller/abstract/helpers.rb
index 43832f1e2d..0a2776de9c 100644
--- a/actionpack/lib/action_controller/abstract/helpers.rb
+++ b/actionpack/lib/action_controller/abstract/helpers.rb
@@ -2,7 +2,7 @@ module AbstractController
   module Helpers
     extend ActiveSupport::Concern
 
-    depends_on Renderer
+    include Renderer
 
     included do
       extlib_inheritable_accessor :master_helper_module
diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/action_controller/abstract/layouts.rb
index b3f21f7b22..273063f74b 100644
--- a/actionpack/lib/action_controller/abstract/layouts.rb
+++ b/actionpack/lib/action_controller/abstract/layouts.rb
@@ -2,7 +2,7 @@ module AbstractController
   module Layouts
     extend ActiveSupport::Concern
 
-    depends_on Renderer
+    include Renderer
 
     included do
       extlib_inheritable_accessor :_layout_conditions
diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/action_controller/abstract/renderer.rb
index cd3e87d861..dd58c7cb64 100644
--- a/actionpack/lib/action_controller/abstract/renderer.rb
+++ b/actionpack/lib/action_controller/abstract/renderer.rb
@@ -4,7 +4,7 @@ module AbstractController
   module Renderer
     extend ActiveSupport::Concern
 
-    depends_on AbstractController::Logger
+    include AbstractController::Logger
 
     included do
       attr_internal :formats
-- 
cgit v1.2.3