diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-02-08 10:21:51 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-02-08 10:21:51 +0000 |
| commit | 828357fb828fc2d07b201f4f97f22ef964ab6a89 (patch) | |
| tree | 6cdfde8ea8d915d53008bcbea7c3c04d819e61a2 | |
| parent | 5eb8a0234a24e517fdfb6236b2955f2b583cd34a (diff) | |
| parent | 73bc9d4eaf8f41532b07a61f5f05d67d6ff78e61 (diff) | |
| download | gitlab-ce-828357fb828fc2d07b201f4f97f22ef964ab6a89.tar.gz | |
Merge branch 'zj-n-1-root-show' into 'master'
Remove N + 1 block for Root#show
Closes #37434 and gitaly#996
See merge request gitlab-org/gitlab-ce!16968
| -rw-r--r-- | app/controllers/root_controller.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/controllers/root_controller.rb b/app/controllers/root_controller.rb index 8acefd58e77..63e5fdb1da5 100644 --- a/app/controllers/root_controller.rb +++ b/app/controllers/root_controller.rb @@ -13,10 +13,7 @@ class RootController < Dashboard::ProjectsController before_action :redirect_logged_user, if: -> { current_user.present? } def index - # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37434 - Gitlab::GitalyClient.allow_n_plus_1_calls do - super - end + super end private |