summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2021-12-06 22:53:58 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2021-12-06 22:53:58 +0000
commit83ca7f60f94ee2d3f1a966fa9757849da5de4035 (patch)
tree5cca41bee4989af1291c17ab8d7aa3479e20aff0 /config
parent9d9ee598bc514eaee681b40cdff4d12a3a8f412a (diff)
parent76ceea558aae5013c4e16b3b2f97363608765c21 (diff)
downloadgitlab-ce-83ca7f60f94ee2d3f1a966fa9757849da5de4035.tar.gz
Merge remote-tracking branch 'dev/14-5-stable' into 14-5-stable
Diffstat (limited to 'config')
-rw-r--r--config/application.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index dde1eae30e7..f64e5c998eb 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -411,6 +411,7 @@ module Gitlab
config.cache_store = :redis_cache_store, Gitlab::Redis::Cache.active_support_config
config.active_job.queue_adapter = :sidekiq
+ config.active_job.logger = nil
config.action_mailer.deliver_later_queue_name = :mailers
# This is needed for gitlab-shell