diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-03-02 00:16:08 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-03-02 00:16:08 +0800 |
| commit | d82a72feda33431f1c94be21f1d473d1c47c6774 (patch) | |
| tree | ab2e03ea0a6115bfbfb3441985577f76ff8cf9ef | |
| parent | b947d6fede791b581095b5b5c98890effc1d499d (diff) | |
| download | gitlab-ce-strictly-require-a-pipeline-to-merge.tar.gz | |
Strictly require a pipeline to mergestrictly-require-a-pipeline-to-merge
External pipeline might be on the way! Also, there could have a
small time window that the pipeline isn't created yet.
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index d6e7ed87555..fddf4714496 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -708,7 +708,7 @@ class MergeRequest < ActiveRecord::Base def mergeable_ci_state? return true unless project.only_allow_merge_if_build_succeeds? - !head_pipeline || head_pipeline.success? || head_pipeline.skipped? + head_pipeline && (head_pipeline.success? || head_pipeline.skipped?) end def environments_for(current_user) |