summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-05-23 12:32:57 +0000
committerRémy Coutable <remy@rymai.me>2017-05-23 12:32:57 +0000
commit48422b415d16927d0382dd401145807a50a00772 (patch)
treea5b8849303c826bc9d82e2ac4ebc255f0b6d6a97 /.gitlab-ci.yml
parent837bd6a6dd31fa407762e21039b47de983fba6c0 (diff)
parente516b9726ea96c739b8eca532a04b77c52f8d4f3 (diff)
downloadgitlab-ce-48422b415d16927d0382dd401145807a50a00772.tar.gz
Merge branch 'run-mysql-on-stable' into 'master'
Run MySQL tests on *-stable as well See merge request !11602
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3af2d4adc13..638553d7bf7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,6 +63,7 @@ stages:
.only-master-and-ee-or-mysql: &only-master-and-ee-or-mysql
only:
- /mysql/
+ - /-stable$/
- master@gitlab-org/gitlab-ce
- master@gitlab/gitlabhq
- tags@gitlab-org/gitlab-ce