diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-12-10 21:17:32 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-12-10 21:18:24 -0800 |
| commit | 1bd7f7cb201a246f3376481f7d7ab53f415f843b (patch) | |
| tree | 89bfafe88d266e454366901a7b11754f68528523 /app | |
| parent | 185f8a5da6b4bd6090aa41e5f39ad0381200ee84 (diff) | |
| download | gitlab-ce-1bd7f7cb201a246f3376481f7d7ab53f415f843b.tar.gz | |
Revert "Merge branch '28682-can-merge-branch-before-build-is-started' into 'master'"
This reverts commit 793be43b35bc8cd2a9effe38280417ee198647cb, reversing
changes made to 8d0b4872ba3ff787c4067618f48b60bd24466c74.
For projects not using any CI, enabling merge only when pipeline succeeds
caused merge requests to be in unmergeable state, which caused significant
confusion.
See https://gitlab.com/gitlab-org/gitlab-ce/issues/55144 for more details.
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/merge_request.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 861211ffc0a..77e48ce11e8 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -978,6 +978,7 @@ class MergeRequest < ActiveRecord::Base def mergeable_ci_state? return true unless project.only_allow_merge_if_pipeline_succeeds? + return true unless head_pipeline actual_head_pipeline&.success? || actual_head_pipeline&.skipped? end |