diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-03-19 17:37:54 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-03-19 17:37:54 -0400 |
| commit | 085538c2bd817fc083ee9e42c9fdd7f74fc48ecb (patch) | |
| tree | d7beb73fab81ab9bf4c1c95fe8dd0e7a0ed29c36 /app/controllers/explore | |
| parent | 3f22a92f4a561543c2249786b695d0c65120455b (diff) | |
| download | gitlab-ce-085538c2bd817fc083ee9e42c9fdd7f74fc48ecb.tar.gz | |
Use the configured Kaminari "per page" defaultrs-use-kaminari-default
Diffstat (limited to 'app/controllers/explore')
| -rw-r--r-- | app/controllers/explore/groups_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/explore/projects_controller.rb | 6 | ||||
| -rw-r--r-- | app/controllers/explore/snippets_controller.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/explore/groups_controller.rb b/app/controllers/explore/groups_controller.rb index a9bf4321f73..2580f15c432 100644 --- a/app/controllers/explore/groups_controller.rb +++ b/app/controllers/explore/groups_controller.rb @@ -3,6 +3,6 @@ class Explore::GroupsController < Explore::ApplicationController @groups = Group.order_id_desc @groups = @groups.search(params[:search]) if params[:search].present? @groups = @groups.sort(@sort = params[:sort]) - @groups = @groups.page(params[:page]).per(PER_PAGE) + @groups = @groups.page(params[:page]) end end diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb index 8271ca87436..88a0c18180b 100644 --- a/app/controllers/explore/projects_controller.rb +++ b/app/controllers/explore/projects_controller.rb @@ -8,7 +8,7 @@ class Explore::ProjectsController < Explore::ApplicationController @projects = @projects.where(visibility_level: params[:visibility_level]) if params[:visibility_level].present? @projects = filter_projects(@projects) @projects = @projects.sort(@sort = params[:sort]) - @projects = @projects.includes(:namespace).page(params[:page]).per(PER_PAGE) + @projects = @projects.includes(:namespace).page(params[:page]) respond_to do |format| format.html @@ -23,7 +23,7 @@ class Explore::ProjectsController < Explore::ApplicationController def trending @projects = TrendingProjectsFinder.new.execute(current_user) @projects = filter_projects(@projects) - @projects = @projects.page(params[:page]).per(PER_PAGE) + @projects = @projects.page(params[:page]) respond_to do |format| format.html @@ -39,7 +39,7 @@ class Explore::ProjectsController < Explore::ApplicationController @projects = ProjectsFinder.new.execute(current_user) @projects = filter_projects(@projects) @projects = @projects.reorder('star_count DESC') - @projects = @projects.page(params[:page]).per(PER_PAGE) + @projects = @projects.page(params[:page]) respond_to do |format| format.html diff --git a/app/controllers/explore/snippets_controller.rb b/app/controllers/explore/snippets_controller.rb index b70ac51d06e..28760c3f84b 100644 --- a/app/controllers/explore/snippets_controller.rb +++ b/app/controllers/explore/snippets_controller.rb @@ -1,6 +1,6 @@ class Explore::SnippetsController < Explore::ApplicationController def index @snippets = SnippetsFinder.new.execute(current_user, filter: :all) - @snippets = @snippets.page(params[:page]).per(PER_PAGE) + @snippets = @snippets.page(params[:page]) end end |