summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2018-12-04 19:26:45 +0100
committerYorick Peterse <yorickpeterse@gmail.com>2018-12-04 19:26:45 +0100
commit230beace20835f586ceb9ea0f78918795a9a8e5d (patch)
treeac8a7cbca4f377c7732d94a8c5f2b22dda9efdf7 /.gitlab-ci.yml
parentacd18a0900fd26bb52fe76642c14e3e890cff732 (diff)
downloadgitlab-ce-230beace20835f586ceb9ea0f78918795a9a8e5d.tar.gz
Temporarily disable automatic merging
It appears that for some jobs (https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/129705025 for example) we process a range of commits far greater than necessary, which can lead to commits getting reverted that were merged a long time ago. [ci skip]
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 4e71140fbc9..d738a13531b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1043,6 +1043,7 @@ merge:master:
- $MERGE_TRAIN_SSH_PUBLIC_KEY
- $MERGE_TRAIN_SSH_PRIVATE_KEY
- $MERGE_TRAIN_API_TOKEN
+ - $MERGE_FORCE_ENABLE
script:
- scripts/merge-train
cache: