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, 15 insertions, 2 deletions

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index d6ad045294..d3a0ecb243 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -5,7 +5,7 @@ module Rails
     class Configuration < ::Rails::Engine::Configuration
       include ::Rails::Configuration::Deprecated
 
-      attr_accessor :allow_concurrency, :cache_classes, :cache_store, :colorize_logging,
+      attr_accessor :allow_concurrency, :cache_classes, :cache_store,
                     :consider_all_requests_local, :dependency_loading,
                     :filter_parameters,  :log_level, :logger, :metals,
                     :plugins, :preload_frameworks, :reload_engines, :reload_plugins,
@@ -14,7 +14,6 @@ module Rails
       def initialize(*)
         super
         @allow_concurrency   = false
-        @colorize_logging    = true
         @filter_parameters   = []
         @dependency_loading  = true
         @serve_static_assets = true
@@ -22,6 +21,10 @@ module Rails
         @consider_all_requests_local = true
       end
 
+      def middleware
+        @@default_middleware_stack ||= default_middleware
+      end
+
       def paths
         @paths ||= begin
           paths = super
@@ -81,6 +84,16 @@ module Rails
       def log_level
         @log_level ||= Rails.env.production? ? :info : :debug
       end
+
+      def colorize_logging
+        @colorize_logging
+      end
+
+      def colorize_logging=(val)
+        @colorize_logging = val
+        Rails::LogSubscriber.colorize_logging = val
+        self.generators.colorize_logging = val
+      end
     end
   end
 end
\ No newline at end of file