summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-11-30 16:45:09 +0100
committerRémy Coutable <remy@rymai.me>2016-11-30 16:45:09 +0100
commitc7b7a6b33f20699f293ddeec35ea9f767341e462 (patch)
tree892147c56f7d9a3491fbbb2fcbf728b9b545e92f
parent2c0d9890e675c8799e76a69f7e432463fa06f996 (diff)
downloadgitlab-ce-c7b7a6b33f20699f293ddeec35ea9f767341e462.tar.gz
Disable the ee_compat_check task on dev
We usually use it for security fixes that don't need to be ported to EE and the task seems to hang when run against the security branch. Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--.gitlab-ci.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c357c489f8..c7528029c89 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -229,7 +229,6 @@ rake ee_compat_check:
<<: *exec
only:
- branches@gitlab-org/gitlab-ce
- - branches@gitlab/gitlabhq
except:
- master
- tags