summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-09-20 11:30:47 +0000
committerRémy Coutable <remy@rymai.me>2017-09-20 11:30:47 +0000
commita09d032b2a64c7b6652dcd589de2d9bcba7d9613 (patch)
treef182dd3d91f8817124925ad32c237da0c9ab8139 /.gitlab-ci.yml
parent7cd2d52829a602606f0b0e9e41498a9bad6fae92 (diff)
parent8281865092a4d2c25bd036d2feff6a8499c320b0 (diff)
downloadgitlab-ce-a09d032b2a64c7b6652dcd589de2d9bcba7d9613.tar.gz
Merge branch '37713-enable-ee_compat_check-for-forks' into 'master'
Enable ee_compat_check for forks, but not EE Closes #37713 See merge request gitlab-org/gitlab-ce!14189
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 375757086a6..f8f73e4d4d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -412,12 +412,12 @@ downtime_check:
ee_compat_check:
<<: *rake-exec
- only:
- - branches@gitlab-org/gitlab-ce
except:
- master
- tags
- /^[\d-]+-stable(-ee)?/
+ - branches@gitlab-org/gitlab-ee
+ - branches@gitlab/gitlab-ee
allow_failure: yes
cache:
key: "ee_compat_check_repo"