summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorLuke Bennett <lukeeeebennettplus@gmail.com>2018-06-05 15:35:40 +0100
committerLuke Bennett <lukeeeebennettplus@gmail.com>2018-06-05 15:35:40 +0100
commitbb7f44aa8cf61d590bf45efb20c4ce19234ce03d (patch)
tree9e7142ae51453d1a9e8421e92618fd4814867465 /lib/api
parentd35ad403f50b2d496f0d5938502fb55ef2190f7c (diff)
parentefed7b6dc4a9db5f3789f30ebbf9748eb716f90f (diff)
downloadgitlab-ce-bb7f44aa8cf61d590bf45efb20c4ce19234ce03d.tar.gz
Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redesign-with-draggable-labels
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/jobs.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/jobs.rb b/lib/api/jobs.rb
index 54d1acbd412..e95b0dd5267 100644
--- a/lib/api/jobs.rb
+++ b/lib/api/jobs.rb
@@ -54,6 +54,7 @@ module API
pipeline = user_project.pipelines.find(params[:pipeline_id])
builds = pipeline.builds
builds = filter_builds(builds, params[:scope])
+ builds = builds.preload(:job_artifacts_archive)
present paginate(builds), with: Entities::Job
end