diff options
| author | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-25 18:48:58 +0200 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-25 18:48:58 +0200 |
| commit | 142bbd900b791478b2ad473efc8e0f78a7afe00d (patch) | |
| tree | c93aa1cf9dbd53da3a5b7dd008509678490951eb /app/controllers/projects | |
| parent | fea7b9e68255771a308e9d391079d83c58340814 (diff) | |
| parent | b83dcd3a30539f86b13d91ffd24fb708652eae80 (diff) | |
| download | gitlab-ce-142bbd900b791478b2ad473efc8e0f78a7afe00d.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issues
# Conflicts:
# app/assets/javascripts/notes/components/issue_comment_form.vue
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/tree_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
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 |