From d82a72feda33431f1c94be21f1d473d1c47c6774 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Thu, 2 Mar 2017 00:16:08 +0800 Subject: Strictly 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. --- app/models/merge_request.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v1.2.1