From b01db07a9f009016186da34c4936a9efb2c224c6 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Tue, 2 Mar 2010 12:32:31 -0800
Subject: Moved initializers for ActionMailer and ActionController into their
 own railties

---
 actionmailer/lib/action_mailer/railtie.rb   |  5 +++++
 actionpack/lib/action_controller/railtie.rb |  5 +++++
 railties/lib/rails/application/bootstrap.rb | 16 ++--------------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index c5f18c7911..779486fc96 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -16,6 +16,11 @@ module ActionMailer
       ActionMailer::Base.logger ||= Rails.logger
     end
 
+    initializer "action_mailer.add_view_paths" do |app|
+      views = app.config.paths.app.views.to_a
+      ActionMailer::Base.prepend_view_path(views)
+    end
+
     initializer "action_mailer.set_configs" do |app|
       app.config.action_mailer.each do |k,v|
         ActionMailer::Base.send "#{k}=", v
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index 07c6b8f2b6..a18b63fb13 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -27,6 +27,11 @@ module ActionController
       ActionController::Base.cache_store ||= RAILS_CACHE
     end
 
+    initializer "action_controller.add_view_paths" do |app|
+      views = app.config.paths.app.views.to_a
+      ActionController::Base.prepend_view_path(views)
+    end
+
     initializer "action_controller.set_helpers_path" do |app|
       ActionController::Base.helpers_path = app.config.paths.app.helpers.to_a
     end
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index 0714b34b31..06243f2e5e 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -1,3 +1,5 @@
+require "active_support/notifications"
+
 module Rails
   class Application
     module Bootstrap
@@ -49,20 +51,6 @@ module Rails
         end
       end
 
-      # Initialize rails log subscriber on top of notifications.
-      initializer :initialize_log_subscriber do
-        require 'active_support/notifications'
-
-        if config.colorize_logging == false
-          Rails::LogSubscriber.colorize_logging = false
-          config.generators.colorize_logging = false
-        end
-
-        ActiveSupport::Notifications.subscribe do |*args|
-          Rails::LogSubscriber.dispatch(args)
-        end
-      end
-
       initializer :set_clear_dependencies_hook do
         unless config.cache_classes
           ActionDispatch::Callbacks.after do
-- 
cgit v1.2.3