summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-06-29 15:27:07 +0000
committerRémy Coutable <remy@rymai.me>2017-06-29 15:27:07 +0000
commiteb77e6384c142b6a054971e28a4938bba9834fe1 (patch)
tree07f6f4f3db52fb0cc3790b8aaf9ca0d3cbdbe999
parent31c21d50fcd64bf9a2fde0e2358a416237334be2 (diff)
parentc5607879aece2173459e3428022a860ee93aa873 (diff)
downloadgitlab-ce-eb77e6384c142b6a054971e28a4938bba9834fe1.tar.gz
Merge branch 'jej/run-mysql-tests-on-stable-preparation-branches' into 'master'
Run mysql tests on stable preperation branches like 9-3-stable-patch-2 See merge request !12552
-rw-r--r--.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 790d9a1f72a..e52b656599c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,7 +63,7 @@ stages:
.only-master-and-ee-or-mysql: &only-master-and-ee-or-mysql
only:
- /mysql/
- - /-stable$/
+ - /-stable/
- master@gitlab-org/gitlab-ce
- master@gitlab/gitlabhq
- tags@gitlab-org/gitlab-ce