diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 21:11:53 +0100 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 21:11:53 +0100 |
| commit | 729391fbfce4dea58478b65c684a24a1bfd125a2 (patch) | |
| tree | f9f0d9c391744fed388f99d44e96c908ed7aa1f1 /config/gitlab.yml.example | |
| parent | 999118f0ec6edabc9e13c089381ad664970a080a (diff) | |
| parent | 8af23def1d6450420d06b8de54d23311a978de20 (diff) | |
| download | gitlab-ce-729391fbfce4dea58478b65c684a24a1bfd125a2.tar.gz | |
Merge commit '8af23def1d6' into object-storage-ee-to-ce-backport
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c360c42509a..65b4d63df2f 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -216,14 +216,16 @@ production: &base host: 'https://mattermost.example.com' ## Gravatar - ## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html + ## If using gravatar.com, there's nothing to change here. For Libravatar + ## you'll need to provide the custom URLs. For more information, + ## see: https://docs.gitlab.com/ee/customization/libravatar.html gravatar: - # gravatar urls: possible placeholders: %{hash} %{size} %{email} %{username} - # plain_url: "http://..." # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon + # Gravatar/Libravatar URLs: possible placeholders: %{hash} %{size} %{email} %{username} + # 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 ## Auxiliary jobs - # Periodically executed jobs, to self-heal Gitlab, do external synchronizations, etc. + # 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 cron_jobs: # Flag stuck CI jobs as failed @@ -725,8 +727,6 @@ test: # user: YOUR_USERNAME pages: path: tmp/tests/pages - artifacts: - path: tmp/tests/artifacts repositories: storages: default: |