Merge branch 'rc/cob-backport-ce-to-ee-fix' into 'master'

Fix logger disabling on the CI: instantiate an ActiveSupport::TaggedLogging See merge request !12987

Merge branch 'rc/cob-backport-ce-to-ee-fix' into 'master'
b6555693 · Robert Speicher · 4229bcbf · ba74f389 · b6555693
Commit b6555693 authored Jul 20, 2017 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

test.rb config/environments/test.rb +1 -1

No files found.
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -45,7 +45,7 @@ Rails.application.configure do
  config.active_job.queue_adapter = :test

  if ENV['CI'] && !ENV['RAILS_ENABLE_TEST_LOG']
-    config.logger = Logger.new(nil)
+    config.logger = ActiveSupport::TaggedLogging.new(Logger.new(nil))
    config.log_level = :fatal
  end
 end