diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-02-20 15:07:54 +0000 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-02-20 15:07:54 +0000 |
| commit | 185f567d58e72ff543ac678d9ac851d792e1e6ea (patch) | |
| tree | 1b7395d38e7607bad8a7a711ca9d3808cca82be0 /app/controllers | |
| parent | 07fc0ea756af640aab38c7b00c10e3bc68c90d89 (diff) | |
| download | gitlab-ce-185f567d58e72ff543ac678d9ac851d792e1e6ea.tar.gz | |
Revert "Merge branch 'zj-n-1-root-show' into 'master'"
This reverts merge request !16968
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/root_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/root_controller.rb b/app/controllers/root_controller.rb index 63e5fdb1da5..8acefd58e77 100644 --- a/app/controllers/root_controller.rb +++ b/app/controllers/root_controller.rb @@ -13,7 +13,10 @@ class RootController < Dashboard::ProjectsController before_action :redirect_logged_user, if: -> { current_user.present? } def index - super + # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37434 + Gitlab::GitalyClient.allow_n_plus_1_calls do + super + end end private |