summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb4
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)