summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-04-07 18:09:14 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-04-07 18:09:14 +0000
commit314370282c13db2f5466a0241988cf60abddb58e (patch)
tree87a8fa4b5638487f655b1772e6672c7319f0f17c /app/controllers
parentfd16c892556a345d43a5ffc1c7bbc28b63b0a49c (diff)
parent16a2eba52b8286533d881ec1a0454ca734d41c3f (diff)
downloadgitlab-ce-314370282c13db2f5466a0241988cf60abddb58e.tar.gz
Merge branch 'optimise-builds' into 'master'
Optimise Pipelines > Jobs index controller Closes #27389 See merge request !10546
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/builds_controller.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb
index add66ce9f84..04e8cdf6256 100644
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -19,6 +19,11 @@ class Projects::BuildsController < Projects::ApplicationController
else
@builds
end
+ @builds = @builds.includes([
+ { pipeline: :project },
+ :project,
+ :tags
+ ])
@builds = @builds.page(params[:page]).per(30)
end