summaryrefslogtreecommitdiff
path: root/app/presenters
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-07 06:08:15 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-07 06:08:15 +0000
commitf3597fc9f048f07e717ac4cb743a083b219f6258 (patch)
treeef93e46120da926c9b5a86bb8a84865a854e6b27 /app/presenters
parentdc87c6514746996c8d720527c10102d42809804b (diff)
downloadgitlab-ce-f3597fc9f048f07e717ac4cb743a083b219f6258.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/presenters')
-rw-r--r--app/presenters/ci/legacy_stage_presenter.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/presenters/ci/legacy_stage_presenter.rb b/app/presenters/ci/legacy_stage_presenter.rb
index 2a60b1280da..56e268cff9f 100644
--- a/app/presenters/ci/legacy_stage_presenter.rb
+++ b/app/presenters/ci/legacy_stage_presenter.rb
@@ -15,9 +15,10 @@ module Ci
private
def preload_statuses(statuses)
+ loaded_statuses = statuses.load
statuses.tap do |statuses|
# rubocop: disable CodeReuse/ActiveRecord
- ActiveRecord::Associations::Preloader.new.preload(preloadable_statuses(statuses), :tags)
+ ActiveRecord::Associations::Preloader.new.preload(preloadable_statuses(loaded_statuses), %w[tags job_artifacts_archive metadata])
# rubocop: enable CodeReuse/ActiveRecord
end
end