summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2017-12-05 14:30:59 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2017-12-05 14:30:59 +0000
commit003a816afa885d56aa1eb4aadbad2b13b1baa25b (patch)
treeba40a1da8ce0c3844ba1ebf0abbffc4ab66d599d /config
parent29be9c1acc9523a513ce32d8a56298db1a038873 (diff)
parent9711b34491d5cfd6eb2bf379f43dbbcd629a572c (diff)
downloadgitlab-ce-003a816afa885d56aa1eb4aadbad2b13b1baa25b.tar.gz
Merge branch 'zj-multiple-artifacts' into 'master'
Multiple artifacts See merge request gitlab-org/gitlab-ce!14367
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 7f6e68ceed6..c8b6018bc1b 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -649,6 +649,8 @@ test:
# user: YOUR_USERNAME
pages:
path: tmp/tests/pages
+ artifacts:
+ path: tmp/tests/artifacts
repositories:
storages:
default: