diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-12-11 08:58:46 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-12-11 08:58:46 +0000 |
| commit | 85f430cb3cde4ff8c4d24c1b2a426670e38dd44f (patch) | |
| tree | 7124cdc73f3f98e41fbae527c7df96d620e7cec9 /app | |
| parent | 97ba7735eaefa0e749295b722434e1d3826bbbc2 (diff) | |
| parent | 1bd7f7cb201a246f3376481f7d7ab53f415f843b (diff) | |
| download | gitlab-ce-85f430cb3cde4ff8c4d24c1b2a426670e38dd44f.tar.gz | |
Merge branch 'sh-revert-mr-22911' into 'master'
Revert "Merge branch '28682-can-merge-branch-before-build-is-started' into 'master'"
See merge request gitlab-org/gitlab-ce!23715
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 |