diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-01-04 18:17:57 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-01-04 18:17:57 +0000 |
| commit | 54bbcc3df962b46d565bc0274e2932c7a718fdc6 (patch) | |
| tree | c3e1db695eced00df937aaa6e7668df422b3767c | |
| parent | c85c0ccc8d69f2549950588e336cb748f007bd36 (diff) | |
| parent | ebdcbd4552b16b8aacaaaf0bdc1c600685d4e696 (diff) | |
| download | gitlab-ce-54bbcc3df962b46d565bc0274e2932c7a718fdc6.tar.gz | |
Merge branch '41396-ee_compat_check-and-security-fix-development' into 'master'
Do not run ee_compat_check on security branches
Closes #41396
See merge request gitlab-org/gitlab-ce!16188
| -rw-r--r-- | .gitlab-ci.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 82bc62bc0ab..4f47d3f0171 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -431,6 +431,7 @@ ee_compat_check: - master - tags - /^[\d-]+-stable(-ee)?/ + - /^security-/ - branches@gitlab-org/gitlab-ee - branches@gitlab/gitlab-ee retry: 0 |