diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-06-14 13:01:55 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-06-19 10:37:51 +0200 |
| commit | c24e39ab88af8fa3087efa0c7c6335e2941d8641 (patch) | |
| tree | e5239419080085aae9dcbdc96c308a4d28167088 /app/controllers/projects/branches_controller.rb | |
| parent | 0716e19271ec8234b06164bf701a33c16bd221de (diff) | |
| download | gitlab-ce-c24e39ab88af8fa3087efa0c7c6335e2941d8641.tar.gz | |
Counting commits is done by Gitalyzj-counting-commits
Closes https://gitlab.com/gitlab-org/gitaly/issues/382
Diffstat (limited to 'app/controllers/projects/branches_controller.rb')
| -rw-r--r-- | app/controllers/projects/branches_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index b7b36f770f5..cd7250b10fc 100644 --- a/app/controllers/projects/branches_controller.rb +++ b/app/controllers/projects/branches_controller.rb @@ -31,7 +31,10 @@ class Projects::BranchesController < Projects::ApplicationController end end - render + # https://gitlab.com/gitlab-org/gitlab-ce/issues/48097 + Gitlab::GitalyClient.allow_n_plus_1_calls do + render + end end format.json do branches = BranchesFinder.new(@repository, params).execute |