diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-19 12:45:49 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-19 12:45:49 +0000 |
| commit | b0fadeee83f25fc96eac93ea1f0fb278e10ea266 (patch) | |
| tree | 34a4e11a41373b70ec5f43957de40ff56b61cce2 /app | |
| parent | d04ac74556e74df89da8f46ed4188b0376b71c3d (diff) | |
| parent | c24e39ab88af8fa3087efa0c7c6335e2941d8641 (diff) | |
| download | gitlab-ce-b0fadeee83f25fc96eac93ea1f0fb278e10ea266.tar.gz | |
Merge branch 'zj-counting-commits' into 'master'
Counting commits is done by Gitaly
Closes gitaly#382
See merge request gitlab-org/gitlab-ce!19983
Diffstat (limited to 'app')
| -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 |