From 230beace20835f586ceb9ea0f78918795a9a8e5d Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Tue, 4 Dec 2018 19:26:45 +0100
Subject: [PATCH] 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]
---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

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:
-- 
GitLab