From 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 18 Jun 2020 11:18:50 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-1-stable-ee --- app/serializers/pipeline_details_entity.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/serializers/pipeline_details_entity.rb') diff --git a/app/serializers/pipeline_details_entity.rb b/app/serializers/pipeline_details_entity.rb index a58278cf4ef..50efa9ea15d 100644 --- a/app/serializers/pipeline_details_entity.rb +++ b/app/serializers/pipeline_details_entity.rb @@ -9,8 +9,7 @@ class PipelineDetailsEntity < PipelineEntity expose :details do expose :artifacts do |pipeline, options| - rel = pipeline.artifacts - rel = rel.eager_load_job_artifacts_archive if options.fetch(:preload_job_artifacts_archive, true) + rel = pipeline.downloadable_artifacts BuildArtifactEntity.represent(rel, options) end -- cgit v1.2.1