Merge remote branch 'mainstream/master'

Conflicts:
	activerecord/lib/active_record/base.rb
	railties/lib/rails/configuration.rb
	railties/lib/rails/log_subscriber.rb

1 files changed, 2 insertions, 14 deletions

diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index b20e53f2de..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 subscriber on top of notifications.
-      initializer :initialize_subscriber do
-        require 'active_support/notifications'
-
-        if config.colorize_logging == false
-          Rails::Subscriber.colorize_logging = false
-          config.generators.colorize_logging = false
-        end
-
-        ActiveSupport::Notifications.subscribe do |*args|
-          Rails::Subscriber.dispatch(args)
-        end
-      end
-
       initializer :set_clear_dependencies_hook do
         unless config.cache_classes
           ActionDispatch::Callbacks.after do