diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 21:09:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 21:09:21 +0000 |
| commit | 06bb4eba7828ce59fde366734828458c037059b4 (patch) | |
| tree | 44b95a53123d91684cc1c67716ef87cc1c0964fb /app/controllers/dashboard | |
| parent | 219eead23f9feb5da9ec378c451d773aea2dfe61 (diff) | |
| download | gitlab-ce-06bb4eba7828ce59fde366734828458c037059b4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/dashboard')
| -rw-r--r-- | app/controllers/dashboard/projects_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb index 039991e07a2..711be67f8f9 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) + .includes(:forked_from_project, :tags).page(params[:page]) @groups = [] @@ -51,7 +51,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController private def projects - @projects ||= load_projects(params.merge(non_public: true)) + @projects ||= load_projects(params.merge(non_public: true)).page(params[:page]) end def render_projects @@ -73,7 +73,6 @@ 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 |