summaryrefslogtreecommitdiff
path: root/app/controllers/admin/projects_controller.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-03-19 17:37:54 -0400
committerRobert Speicher <rspeicher@gmail.com>2016-03-19 17:37:54 -0400
commit085538c2bd817fc083ee9e42c9fdd7f74fc48ecb (patch)
treed7beb73fab81ab9bf4c1c95fe8dd0e7a0ed29c36 /app/controllers/admin/projects_controller.rb
parent3f22a92f4a561543c2249786b695d0c65120455b (diff)
downloadgitlab-ce-085538c2bd817fc083ee9e42c9fdd7f74fc48ecb.tar.gz
Use the configured Kaminari "per page" defaultrs-use-kaminari-default
Diffstat (limited to 'app/controllers/admin/projects_controller.rb')
-rw-r--r--app/controllers/admin/projects_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
index ae1de06b983..4a6edafdeec 100644
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -12,15 +12,15 @@ class Admin::ProjectsController < Admin::ApplicationController
@projects = @projects.non_archived unless params[:with_archived].present?
@projects = @projects.search(params[:name]) if params[:name].present?
@projects = @projects.sort(@sort = params[:sort])
- @projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(PER_PAGE)
+ @projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page])
end
def show
if @group
- @group_members = @group.members.order("access_level DESC").page(params[:group_members_page]).per(PER_PAGE)
+ @group_members = @group.members.order("access_level DESC").page(params[:group_members_page])
end
- @project_members = @project.project_members.page(params[:project_members_page]).per(PER_PAGE)
+ @project_members = @project.project_members.page(params[:project_members_page])
end
def transfer