summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-08-24 12:26:38 +0000
committerStan Hu <stanhu@gmail.com>2019-08-24 12:26:38 +0000
commit8112fb37544557b3f94c0a558175d5da99ef9829 (patch)
treedcae9194f065fadfbb756d62ac33c85d1278aeef
parente60e6f829c0c1f9c18ad3047659d540664a940b4 (diff)
parent21024065c586e64e802e838c1efe1cb21a3c3a37 (diff)
downloadgitlab-ce-8112fb37544557b3f94c0a558175d5da99ef9829.tar.gz
Merge branch 'mc/bug/nplusone-pipelines-show' into 'master'
Preload tags when loading Ci::Pipeline Closes #60925 See merge request gitlab-org/gitlab-ce!32149
-rw-r--r--app/controllers/projects/pipelines_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index e6e3a440925..499d4918899 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -180,7 +180,7 @@ class Projects::PipelinesController < Projects::ApplicationController
else
project
.all_pipelines
- .includes(user: :status)
+ .includes(builds: :tags, user: :status)
.find_by!(id: params[:id])
.present(current_user: current_user)
end