Revert "Merge branch 'zj-n-1-root-show' into 'master'"

This reverts merge request !16968

Revert "Merge branch 'zj-n-1-root-show' into 'master'"
185f567d · Zeger-Jan van de Weg · 07fc0ea7 · 185f567d
Commit 185f567d authored Feb 20, 2018 by Zeger-Jan van de Weg
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

root_controller.rb app/controllers/root_controller.rb +4 -1

No files found.
--- 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