diff options
author | Rémy Coutable <remy@rymai.me> | 2018-01-25 14:14:46 +0100 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-01-25 14:14:53 +0100 |
commit | 78faa6e3706570b8bf5f8d9f331135080a82679d (patch) | |
tree | 0ab6efc82f5527a4af7f5329bd5a8c1fd09cfc63 /config/gitlab.yml.example | |
parent | d772f52e1ec5848b00fc590606d33645f0799eb5 (diff) | |
download | gitlab-ce-78faa6e3706570b8bf5f8d9f331135080a82679d.tar.gz |
Port some non-EE-specific config/ changes to CE42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-ico
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'config/gitlab.yml.example')
-rw-r--r-- | config/gitlab.yml.example | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 238e1583770..25f4085deb2 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -184,7 +184,7 @@ production: &base # 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 @@ -642,6 +642,8 @@ test: enabled: true lfs: enabled: false + artifacts: + path: tmp/tests/artifacts gitlab: host: localhost port: 80 @@ -652,8 +654,6 @@ test: # user: YOUR_USERNAME pages: path: tmp/tests/pages - artifacts: - path: tmp/tests/artifacts repositories: storages: default: |