Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-18 09:09:06 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-18 09:09:06 +0300
commitcefe554b7ce2d0b52f9de855be832a47c2bc24ab (patch)
tree74c1ad2f688afd2f806aaf94e73e0bcd128cea00 /app/serializers/pipeline_serializer.rb
parent5ee120f46740efac7b8a460d7a92e4da82f4fb0b (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers/pipeline_serializer.rb')
-rw-r--r--app/serializers/pipeline_serializer.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/serializers/pipeline_serializer.rb b/app/serializers/pipeline_serializer.rb
index 58df62dfea5..3ad9f2bc0bf 100644
--- a/app/serializers/pipeline_serializer.rb
+++ b/app/serializers/pipeline_serializer.rb
@@ -7,6 +7,10 @@ class PipelineSerializer < BaseSerializer
# rubocop: disable CodeReuse/ActiveRecord
def represent(resource, opts = {})
if resource.is_a?(ActiveRecord::Relation)
+ # We don't want PipelineDetailsEntity to preload the job_artifacts_archive
+ # because we do it with preloaded_relations in a more optimal way
+ # if the given resource is a collection of multiple pipelines.
+ opts[:preload_job_artifacts_archive] = false
resource = resource.preload(preloaded_relations)
end