Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 5 insertions, 0 deletions

diff --git a/app/controllers/root_controller.rb b/app/controllers/root_controller.rb
index 24452f9a188..14469877e14 100644
--- a/app/controllers/root_controller.rb
+++ b/app/controllers/root_controller.rb
@@ -13,10 +13,15 @@ class RootController < Dashboard::ProjectsController
 
   before_action :redirect_unlogged_user, if: -> { current_user.nil? }
   before_action :redirect_logged_user, if: -> { current_user.present? }
+  # We only need to load the projects when the user is logged in but did not
+  # configure a dashboard. In which case we render projects. We can do that straight
+  # from the #index action.
+  skip_before_action :projects
 
   def index
     # n+1: https://gitlab.com/gitlab-org/gitlab-foss/issues/40260
     Gitlab::GitalyClient.allow_n_plus_1_calls do
+      projects
       super
     end
   end