summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-10-26 13:30:50 +0000
committerRobert Speicher <robert@gitlab.com>2016-10-26 13:30:50 +0000
commit06364c0c1dbbcb893ac9f5264f7004c4d331633a (patch)
tree66b644dbe4c95526e9730b9550c763846c8b055e /.gitlab-ci.yml
parent609f474804e4c13c92863678caecaee5f83b3322 (diff)
parent0d773b086d8da5f19b216b72b8ad215d338e303a (diff)
downloadgitlab-ce-06364c0c1dbbcb893ac9f5264f7004c4d331633a.tar.gz
Merge branch 'dont-test-ee_compat_check-on-master' into 'master'
We don't need to run `ee_compat_check` against `master` See merge request !7119
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 6a1dd054d99..66a1791fc62 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -215,6 +215,7 @@ rake ee_compat_check:
only:
- branches
except:
+ - master
- tags
allow_failure: yes