Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessio Caiazza <acaiazza@gitlab.com>2018-01-03 11:57:48 +0300
committerAlessio Caiazza <acaiazza@gitlab.com>2018-01-04 15:56:00 +0300
commitebdcbd4552b16b8aacaaaf0bdc1c600685d4e696 (patch)
treeddf91cac6227c2f614ba0ece268541fa23a932f9 /.gitlab-ci.yml
parent51562aafc782f7eb65152f0551d9cb41268aeae2 (diff)
Do not run ee_compat_check on security branches
Branches started from `security-X-Y` will likely fail on `ee_compat_check`, the check tries to merge against EE `master` which may likely fail for MR that are not targetted on `master`, like security fixes. This commit disables `ee_compat_check` on branches starting with `security-`.
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 e98ac200332..038eeb2bf61 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