summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-06-29 15:27:07 +0000
committerMike Greiling <mike@pixelcog.com>2017-06-29 12:41:10 -0500
commit8bcdceb94b0b895d1284560f8bae7a4bc815ba8d (patch)
treeb6bf6edd2631b5b3964b273ca8c3dab96d3acca4
parentfe26e095bae6ca444c60bdedaccf4bfce63b0c03 (diff)
downloadgitlab-ce-8bcdceb94b0b895d1284560f8bae7a4bc815ba8d.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 b442e48a3d0..1139c4419cf 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