Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 2 deletions

diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb
index 711be67f8f9..039991e07a2 100644
--- a/app/controllers/dashboard/projects_controller.rb
+++ b/app/controllers/dashboard/projects_controller.rb
@@ -33,7 +33,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
   # rubocop: disable CodeReuse/ActiveRecord
   def starred
     @projects = load_projects(params.merge(starred: true))
-      .includes(:forked_from_project, :tags).page(params[:page])
+      .includes(:forked_from_project, :tags)
 
     @groups = []
 
@@ -51,7 +51,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
   private
 
   def projects
-    @projects ||= load_projects(params.merge(non_public: true)).page(params[:page])
+    @projects ||= load_projects(params.merge(non_public: true))
   end
 
   def render_projects
@@ -73,6 +73,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
                 .execute
                 .includes(:route, :creator, :group, namespace: [:route, :owner])
                 .preload(:project_feature)
+                .page(finder_params[:page])
 
     prepare_projects_for_rendering(projects)
   end