diff options
| author | Francisco Javier López <fjlopez@gitlab.com> | 2018-07-06 07:51:31 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-07-06 07:51:31 +0000 |
| commit | 837c3b3d7322c56aa7baeec9b8fb617afe5b5e5c (patch) | |
| tree | b6da7ba13c76c13e3afee03c11b7524f896f207f /app/controllers/dashboard | |
| parent | 83f79ced3fd98031194e5667c4d80f66d7987c67 (diff) | |
| download | gitlab-ce-837c3b3d7322c56aa7baeec9b8fb617afe5b5e5c.tar.gz | |
Fix User role displayed on projects dashboard
Diffstat (limited to 'app/controllers/dashboard')
| -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 4d4ac025f8c..ccfcbbdc776 100644 --- a/app/controllers/dashboard/projects_controller.rb +++ b/app/controllers/dashboard/projects_controller.rb @@ -7,7 +7,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController skip_cross_project_access_check :index, :starred def index - @projects = load_projects(params.merge(non_public: true)).page(params[:page]) + @projects = load_projects(params.merge(non_public: true)) respond_to do |format| format.html @@ -25,7 +25,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController def starred @projects = load_projects(params.merge(starred: true)) - .includes(:forked_from_project, :tags).page(params[:page]) + .includes(:forked_from_project, :tags) @groups = [] @@ -51,6 +51,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController .new(params: finder_params, current_user: current_user) .execute .includes(:route, :creator, namespace: [:route, :owner]) + .page(finder_params[:page]) prepare_projects_for_rendering(projects) end |