Merge branch 'revert-828357fb' into 'master'

Revert "Merge branch 'zj-n-1-root-show' into 'master'" See merge request gitlab-org/gitlab-ce!17243
2018-02-20 15:56:35 +00:00 · 2018-02-20 15:56:35 +00:00 · 644566041c
parent 088d03bfdb 185f567d58
commit 644566041c
1 changed files with 4 additions and 1 deletions
--- 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