diff options
| author | DJ Mountney <david@twkie.net> | 2018-04-04 12:49:08 -0700 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2018-04-04 12:49:08 -0700 |
| commit | 39bb3720381af64039673cf21705fcf95cf78314 (patch) | |
| tree | c32aa05ee2eaa2e0b93ec811a6ad8f3aa71a207e /config/gitlab.yml.example | |
| parent | f7f92836400ec86c74d1140223c009d3d328aea9 (diff) | |
| parent | 166b4575a6353668c894fea0ba234d0b371dee03 (diff) | |
| download | gitlab-ce-39bb3720381af64039673cf21705fcf95cf78314.tar.gz | |
Merge remote-tracking branch 'origin/master' into dev-master
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 8db66037d61..126a9b8b803 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -226,6 +226,10 @@ production: &base # plain_url: "http://..." # default: https://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon # ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon + ## Sidekiq + sidekiq: + log_format: default # (json is also supported) + ## Auxiliary jobs # Periodically executed jobs, to self-heal GitLab, do external synchronizations, etc. # Please read here for more information: https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job |