diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2018-01-18 14:34:59 +0300 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-01-18 14:34:59 +0300 |
| commit | 99e71dec723e65b6d4f6e8ba6040d800a09ed0a1 (patch) | |
| tree | 3e02a119b8d421be9c79bf88dc4d39fa06e0c460 /lib/api/jobs.rb | |
| parent | 370a4654de51091ed671beb189e5b295f3b0a2ed (diff) | |
| parent | 31c28f219ccd369803def2be819e862f2c65f103 (diff) | |
Merge branch '10-4-stable-prepare-rc7' into '10-4-stable'
Prepare 10.4 RC7 release
See merge request gitlab-org/gitlab-ce!16519
Diffstat (limited to 'lib/api/jobs.rb')
| -rw-r--r-- | lib/api/jobs.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/jobs.rb b/lib/api/jobs.rb index a116ab3c9bd..9c205514b3a 100644 --- a/lib/api/jobs.rb +++ b/lib/api/jobs.rb @@ -38,6 +38,7 @@ module API builds = user_project.builds.order('id DESC') builds = filter_builds(builds, params[:scope]) + builds = builds.preload(:user, :job_artifacts_archive, :runner, pipeline: :project) present paginate(builds), with: Entities::Job end |