summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-11-30 16:59:26 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-11-30 16:59:26 +0000
commit77337a82f0e2ee3d600d7ece248a110cbc3ef58d (patch)
tree27eea895535b296911daaf8b8940f7f0211d6839
parent193b2e6d864265319e94780d4beff84a37ebd839 (diff)
parentc7b7a6b33f20699f293ddeec35ea9f767341e462 (diff)
downloadgitlab-ce-77337a82f0e2ee3d600d7ece248a110cbc3ef58d.tar.gz
Merge branch 'dont-run-ee_compat_check-on-dev' into 'master'
Disable the `ee_compat_check` task on dev See merge request !7847
-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