aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-03-02 12:32:31 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-03-02 12:32:31 -0800
commitb01db07a9f009016186da34c4936a9efb2c224c6 (patch)
tree2bdef9121924656ec22741d0c9c60f0dd4be12d4 /railties
parent57bae9764e45ad19dff7a879eeb46d1dffc5ca22 (diff)
downloadrails-b01db07a9f009016186da34c4936a9efb2c224c6.tar.gz
rails-b01db07a9f009016186da34c4936a9efb2c224c6.tar.bz2
rails-b01db07a9f009016186da34c4936a9efb2c224c6.zip
Moved initializers for ActionMailer and ActionController into their own railties
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/application/bootstrap.rb16
1 files changed, 2 insertions, 14 deletions
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