Commit 230beace authored by Yorick Peterse's avatar Yorick Peterse

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]
parent acd18a09
...@@ -1043,6 +1043,7 @@ merge:master: ...@@ -1043,6 +1043,7 @@ merge:master:
- $MERGE_TRAIN_SSH_PUBLIC_KEY - $MERGE_TRAIN_SSH_PUBLIC_KEY
- $MERGE_TRAIN_SSH_PRIVATE_KEY - $MERGE_TRAIN_SSH_PRIVATE_KEY
- $MERGE_TRAIN_API_TOKEN - $MERGE_TRAIN_API_TOKEN
- $MERGE_FORCE_ENABLE
script: script:
- scripts/merge-train - scripts/merge-train
cache: cache:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment