diff options
| author | Fabio Pitino <fpitino@gitlab.com> | 2019-06-25 14:07:34 +0100 |
|---|---|---|
| committer | Fabio Pitino <fpitino@gitlab.com> | 2019-06-25 14:07:34 +0100 |
| commit | e236fbdb25ee710566d455851238b5ed85b894d7 (patch) | |
| tree | f89e5e83ea59e014a79ce0e5923bd18f33f27823 | |
| parent | a26916d18cab6bc3ed2e6846d130fcd5e36fb313 (diff) | |
| download | gitlab-ce-e236fbdb25ee710566d455851238b5ed85b894d7.tar.gz | |
Use actual_head_pipeline to enforce presence
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index c9079b9897a..82034f5946b 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1030,9 +1030,9 @@ class MergeRequest < ApplicationRecord def mergeable_ci_state? return true unless project.only_allow_merge_if_pipeline_succeeds? - return false unless head_pipeline + return false unless actual_head_pipeline - actual_head_pipeline&.success? || actual_head_pipeline&.skipped? + actual_head_pipeline.success? || actual_head_pipeline.skipped? end def environments_for(current_user) |