diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-07-20 14:29:36 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-07-20 14:29:36 +0000 |
| commit | b6555693a8e445405c5746b7c76c9f603395bba2 (patch) | |
| tree | 64cc30714554a0112fc05424582ae4fe9d9362d9 | |
| parent | 4229bcbf7adc501850caae4b375d4473bfe8c2c3 (diff) | |
| parent | ba74f38946e0889e02e07ea1e6ba98f191ec8c4d (diff) | |
| download | gitlab-ce-b6555693a8e445405c5746b7c76c9f603395bba2.tar.gz | |
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
| -rw-r--r-- | config/environments/test.rb | 2 |
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 |