Make preloading tags final step in relation

app/presenters/ci/legacy_stage_presenter.rb

@@ -4,16 +4,24 @@ module Ci
   class LegacyStagePresenter < Gitlab::View::Presenter::Delegated
     presents :legacy_stage
 
-    def preloaded_statuses
-      legacy_stage.statuses.tap do |statuses|
+    def latest_ordered_statuses
+      preload_statuses(legacy_stage.statuses.latest_ordered)
+    end
+
+    def retried_ordered_statuses
+      preload_statuses(legacy_stage.statuses.retried_ordered)
+    end
+
+    private
+
+    def preload_statuses(statuses)
+      statuses.tap do |statuses|
         # rubocop: disable CodeReuse/ActiveRecord
         ActiveRecord::Associations::Preloader.new.preload(preloadable_statuses(statuses), :tags)
         # rubocop: enable CodeReuse/ActiveRecord
       end
     end
 
-    private
-
     def preloadable_statuses(statuses)
       statuses.reject do |status|
         status.instance_of?(::GenericCommitStatus) || status.instance_of?(::Ci::Bridge)

app/views/projects/stage/_stage.html.haml

-- statuses = stage.present(current_user: current_user).preloaded_statuses
+- stage = stage.present(current_user: current_user)
 
 %tr
   %th{ colspan: 10 }
@@ -8,8 +8,8 @@
         = ci_icon_for_status(stage.status)
        
       = stage.name.titleize
-= render statuses.latest_ordered, stage: false, ref: false, pipeline_link: false, allow_retry: true
-= render statuses.retried_ordered, stage: false, ref: false, pipeline_link: false, retried: true
+= render stage.latest_ordered_statuses, stage: false, ref: false, pipeline_link: false, allow_retry: true
+= render stage.retried_ordered_statuses, stage: false, ref: false, pipeline_link: false, retried: true
 %tr
   %td{ colspan: 10 }
      

spec/presenters/ci/legacy_stage_presenter_spec.rb

@@ -4,18 +4,28 @@ require 'spec_helper'
 
 describe Ci::LegacyStagePresenter do
   let(:legacy_stage) { create(:ci_stage) }
+  let(:presenter) { described_class.new(legacy_stage) }
 
-  describe '#preloaded_statuses' do
-    subject(:preloaded_statuses) { described_class.new(legacy_stage).preloaded_statuses }
+  let!(:build) { create(:ci_build, :tags, pipeline: legacy_stage.pipeline, stage: legacy_stage.name) }
+  let!(:retried_build) { create(:ci_build, :tags, :retried, pipeline: legacy_stage.pipeline, stage: legacy_stage.name) }
 
-    let!(:build) { create(:ci_build, :tags, pipeline: legacy_stage.pipeline, stage: legacy_stage.name) }
+  before do
+    create(:generic_commit_status, pipeline: legacy_stage.pipeline, stage: legacy_stage.name)
+  end
+
+  describe '#latest_ordered_statuses' do
+    subject(:latest_ordered_statuses) { presenter.latest_ordered_statuses }
 
-    before do
-      create(:generic_commit_status, pipeline: legacy_stage.pipeline, stage: legacy_stage.name)
+    it 'preloads build tags' do
+      expect(latest_ordered_statuses.second.association(:tags)).to be_loaded
     end
+  end
+
+  describe '#retried_ordered_statuses' do
+    subject(:retried_ordered_statuses) { presenter.retried_ordered_statuses }
 
     it 'preloads build tags' do
-      expect(preloaded_statuses.first.association(:tags)).to be_loaded
+      expect(retried_ordered_statuses.first.association(:tags)).to be_loaded
     end
   end
 end