From de203245afd2bbf7f93f3241fcf3a71a88101d47 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Thu, 28 May 2009 09:49:02 -0500
Subject: Revert "Revert "Whitespace!""

This reverts commit 0cac68d3bed3e6bf8ec2eb994858e4a179046941.
---
 actionpack/lib/action_controller/abstract/logger.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'actionpack/lib/action_controller/abstract/logger.rb')

diff --git a/actionpack/lib/action_controller/abstract/logger.rb b/actionpack/lib/action_controller/abstract/logger.rb
index 980ede0bed..ce73888763 100644
--- a/actionpack/lib/action_controller/abstract/logger.rb
+++ b/actionpack/lib/action_controller/abstract/logger.rb
@@ -9,7 +9,7 @@ module AbstractController
       def initialize(&blk)
         @blk = blk
       end
-      
+
       def to_s
         @blk.call
       end
@@ -19,10 +19,10 @@ module AbstractController
     included do
       cattr_accessor :logger
     end
-    
+
     def process(action)
       ret = super
-      
+
       if logger
         log = DelayedLog.new do
           "\n\nProcessing #{self.class.name}\##{action_name} " \
@@ -32,14 +32,14 @@ module AbstractController
 
         logger.info(log)
       end
-      
+
       ret
     end
-    
+
     def request_origin
       # this *needs* to be cached!
       # otherwise you'd get different results if calling it more than once
       @request_origin ||= "#{request.remote_ip} at #{Time.now.to_s(:db)}"
-    end    
+    end
   end
 end
-- 
cgit v1.2.3


From 4e50a35fa243f6cf7ad567774a9f7c1cb87a1653 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Thu, 28 May 2009 11:35:36 -0500
Subject: Break up DependencyModule's dual function of providing a "depend_on"
 DSL and "included" block DSL into separate modules. But, unify both
 approaches under AS::Concern.

---
 actionpack/lib/action_controller/abstract/logger.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_controller/abstract/logger.rb')

diff --git a/actionpack/lib/action_controller/abstract/logger.rb b/actionpack/lib/action_controller/abstract/logger.rb
index ce73888763..d6fa843485 100644
--- a/actionpack/lib/action_controller/abstract/logger.rb
+++ b/actionpack/lib/action_controller/abstract/logger.rb
@@ -3,7 +3,7 @@ require 'active_support/core_ext/logger'
 
 module AbstractController
   module Logger
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     class DelayedLog
       def initialize(&blk)
-- 
cgit v1.2.3