From 6ca02a41500790b3e9061dd8836540955b9aaf7c Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz@gitlab.com>
Date: Tue, 5 Dec 2017 14:31:33 +0000
Subject: Merge branch 'zj-multiple-artifacts-ee' into 'master'

Multiple artifacts ee

See merge request gitlab-org/gitlab-ee!3276
---
 config/gitlab.yml.example | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config/gitlab.yml.example')

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 0ffacad400b..e2256c5c118 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -672,6 +672,7 @@ test:
         aws_secret_access_key: AWS_SECRET_ACCESS_KEY
         region: eu-central-1
   artifacts:
+    path: tmp/tests/artifacts
     enabled: true
     # The location where build artifacts are stored (default: shared/artifacts).
     # path: shared/artifacts
-- 
cgit v1.2.3