summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-08-11 13:17:18 +0000
committerSimon Knox <psimyn@gmail.com>2017-08-15 09:06:48 +1000
commit827e39070f218004540920455dfb11f5618f0607 (patch)
tree08b0d11ab79aecbc24ca58ef37968ee4f12111b2 /.gitlab-ci.yml
parent9b476402f6de95db5ba879c64243b1eea5f58c42 (diff)
downloadgitlab-ce-827e39070f218004540920455dfb11f5618f0607.tar.gz
Merge branch '35131-do-not-run-ee_compat_check-for-stableish-branches' into 'master'
Do not run the `ee_compat_check` job for stableish branches Closes #35131 See merge request !13497
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f55bdc19eec..b68b5504e7c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -354,7 +354,7 @@ ee_compat_check:
except:
- master
- tags
- - /^[\d-]+-stable(-ee)?$/
+ - /^[\d-]+-stable(-ee)?/
allow_failure: yes
cache:
key: "ee_compat_check_repo"