Use actual_head_pipeline to enforce presence

e236fbdb · Fabio Pitino · a26916d1 · e236fbdb
Commit e236fbdb authored Jun 25, 2019 by Fabio Pitino
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/models/merge_request.rb app/models/merge_request.rb +2 -2

No files found.
--- 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)