From a1f96aa254000255c6f2100a334726c6d72a53b4 Mon Sep 17 00:00:00 2001 From: Andrew Newdigate Date: Fri, 22 Sep 2017 17:53:08 +0100 Subject: [PATCH] Workaround for n+1 in Projects::TreeController#show See https://gitlab.com/gitlab-org/gitlab-ce/issues/38261 --- app/controllers/projects/tree_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/projects/tree_controller.rb b/app/controllers/projects/tree_controller.rb index 1fc276b8c03..f3784f4e07c 100644 --- a/app/controllers/projects/tree_controller.rb +++ b/app/controllers/projects/tree_controller.rb @@ -35,7 +35,10 @@ class Projects::TreeController < Projects::ApplicationController end format.json do - render json: TreeSerializer.new(project: @project, repository: @repository, ref: @ref).represent(@tree) + # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/38261 + Gitlab::GitalyClient.allow_n_plus_1_calls do + render json: TreeSerializer.new(project: @project, repository: @repository, ref: @ref).represent(@tree) + end end end end