kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '38171-workaround' into 'master' 

Workaround for n+1 in Projects::TreeController#show

Closes #38171

See merge request gitlab-org/gitlab-ce!14455
This commit is contained in:
Robert Speicher 2017-09-22 21:47:50 +00:00
parent 7cf8e0981a a1f96aa254
commit 024d10b7ad
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/projects/tree_controller.rb
View File

@ -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