summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-07-20 10:39:21 +0200
committerRémy Coutable <remy@rymai.me>2017-07-20 11:16:12 +0200
commitba74f38946e0889e02e07ea1e6ba98f191ec8c4d (patch)
tree1f2b4eb8a5ac8ee2215fac87efa5a7d062bd8fda
parent445cd22c72ca6fbfdcf18d67fa859c4b5b9e2a6c (diff)
downloadgitlab-ce-rc/cob-backport-ce-to-ee-fix.tar.gz
Fix logger disabling on the CI: instantiate an ActiveSupport::TaggedLoggingrc/cob-backport-ce-to-ee-fix
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--config/environments/test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 986107150cf..278144b8943 100644
--- 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