diff options
| author | Marin Jankovski <marin@gitlab.com> | 2018-12-04 18:35:18 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2018-12-04 18:35:18 +0000 |
| commit | 925e4cc93b88443937265594e94550413f2efac7 (patch) | |
| tree | a2c2ee8dd6f9b5c9f487378d95fe3d021d775bfe | |
| parent | f78b8de6b30fe7ca0c944fee7b220e86b0c659b5 (diff) | |
| parent | 230beace20835f586ceb9ea0f78918795a9a8e5d (diff) | |
| download | gitlab-ce-925e4cc93b88443937265594e94550413f2efac7.tar.gz | |
Merge branch 'disable-automatic-merge' into 'master'
Temporarily disable automatic merging
See merge request gitlab-org/gitlab-ce!23560
| -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 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: |