Simplify the query to fetch base and head pipelines

d867081d · Shinya Maeda · 394ea2f9 · d867081d
Commit d867081d authored Aug 02, 2018 by Shinya Maeda
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

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

No files found.
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -1029,11 +1029,8 @@ class MergeRequest < ActiveRecord::Base
  def calculate_reactive_cache(base_pipeline_iid, head_pipeline_iid)
    begin
-      if base_pipeline_iid
+      base_pipeline = project.pipelines.find_by_iid(base_pipeline_iid)
-        base_pipeline, head_pipeline = project.pipelines.where(iid: [base_pipeline_iid, head_pipeline_iid]).all
+      head_pipeline = project.pipelines.find_by_iid(head_pipeline_iid)
-      else
-        head_pipeline = project.pipelines.find(iid: head_pipeline_iid)
-      end
      comparer = Gitlab::Ci::Reports::TestReportsComparer
        .new(base_pipeline&.test_reports, head_pipeline.test_reports)