diff options
author | Josh Frye <joshfng@gmail.com> | 2016-03-09 20:58:41 -0500 |
---|---|---|
committer | Josh Frye <joshfng@gmail.com> | 2016-03-09 21:03:28 -0500 |
commit | 449954ecc2ad0c1796b2949b79b56329c6ce2447 (patch) | |
tree | 9064bd0ef742e8514bc17859879fa74e7e4e65f4 /app/controllers/dashboard/projects_controller.rb | |
parent | 60d0a20b3a0077df6404ad9ef02f1a2963ed4c02 (diff) | |
download | gitlab-ce-449954ecc2ad0c1796b2949b79b56329c6ce2447.tar.gz |
Allow filtered dashboard/explore results to be paged. Fixes #14104fix-filtered-pagination
Diffstat (limited to 'app/controllers/dashboard/projects_controller.rb')
-rw-r--r-- | app/controllers/dashboard/projects_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb index fc51c3241af..0e8b63872ca 100644 --- a/app/controllers/dashboard/projects_controller.rb +++ b/app/controllers/dashboard/projects_controller.rb @@ -8,7 +8,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController @projects = filter_projects(@projects) @projects = @projects.includes(:namespace) @projects = @projects.sort(@sort = params[:sort]) - @projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank? + @projects = @projects.page(params[:page]).per(PER_PAGE) @last_push = current_user.recent_push @@ -32,7 +32,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController @projects = filter_projects(@projects) @projects = @projects.includes(:namespace, :forked_from_project, :tags) @projects = @projects.sort(@sort = params[:sort]) - @projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank? + @projects = @projects.page(params[:page]).per(PER_PAGE) @last_push = current_user.recent_push @groups = [] |