diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/serializers/pipeline_details_entity.rb | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/serializers/pipeline_details_entity.rb')
-rw-r--r-- | app/serializers/pipeline_details_entity.rb | 3 |
1 files changed, 1 insertions, 2 deletions
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 |