Automatic merge of gitlab-org/gitlab-ce master

d92be5a6 · GitLab Bot · 5e8a2506 · c51c57d0 · d92be5a6
Commit d92be5a6 authored Sep 09, 2019 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

config/gitlab.yml.example config/gitlab.yml.example +1 -1

No files found.
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -342,7 +342,7 @@ production: &base

  ## Sidekiq
  sidekiq:
-    log_format: default # (json is also supported)
+    log_format: json # (default is the original format)

  ## Auxiliary jobs
  # Periodically executed jobs, to self-heal GitLab, do external synchronizations, etc.