Merge branch 'disable-automatic-merge' into 'master'

Temporarily disable automatic merging See merge request gitlab-org/gitlab-ce!23560

Merge branch 'disable-automatic-merge' into 'master'
Temporarily disable automatic merging See merge request gitlab-org/gitlab-ce!23560
925e4cc9 · Marin Jankovski · f78b8de6 · 230beace · 925e4cc9
Commit 925e4cc9 authored Dec 04, 2018 by Marin Jankovski
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

.gitlab-ci.yml .gitlab-ci.yml +1 -0

No files found.
--- 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: