diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 12:09:26 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 12:09:26 +0000 |
| commit | c9687bdf58e9d4a9c3942f587bd4841f42e3b5de (patch) | |
| tree | a60a2e20f152483be6a92bacdf10564bbc96c664 /app/controllers/dashboard/projects_controller.rb | |
| parent | 3f3e4bcc50a3280d03299c2c263eafd9c8e3bd7b (diff) | |
| download | gitlab-ce-c9687bdf58e9d4a9c3942f587bd4841f42e3b5de.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/dashboard/projects_controller.rb')
| -rw-r--r-- | app/controllers/dashboard/projects_controller.rb | 5 |
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 |