diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-02-20 15:56:35 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-02-20 15:56:35 +0000 |
| commit | 644566041c803e7a82ae40a88f0a30cb05ce782a (patch) | |
| tree | 85e07fb53c9daa37d1f3e2b754cd95587d42be55 | |
| parent | 088d03bfdbe336549dc449e03443a35cef620ffa (diff) | |
| parent | 185f567d58e72ff543ac678d9ac851d792e1e6ea (diff) | |
| download | gitlab-ce-644566041c803e7a82ae40a88f0a30cb05ce782a.tar.gz | |
Merge branch 'revert-828357fb' into 'master'
Revert "Merge branch 'zj-n-1-root-show' into 'master'"
See merge request gitlab-org/gitlab-ce!17243
| -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 |