Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/models/merge_request.rb2
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)