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/concerns | |
| parent | 3f22a92f4a561543c2249786b695d0c65120455b (diff) | |
| download | gitlab-ce-085538c2bd817fc083ee9e42c9fdd7f74fc48ecb.tar.gz | |
Use the configured Kaminari "per page" defaultrs-use-kaminari-default
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/global_milestones.rb | 2 | ||||
| -rw-r--r-- | app/controllers/concerns/issues_action.rb | 2 | ||||
| -rw-r--r-- | app/controllers/concerns/merge_requests_action.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/concerns/global_milestones.rb b/app/controllers/concerns/global_milestones.rb index 3e4c0e63601..54ea1e454fc 100644 --- a/app/controllers/concerns/global_milestones.rb +++ b/app/controllers/concerns/global_milestones.rb @@ -6,7 +6,7 @@ module GlobalMilestones @milestones = MilestonesFinder.new.execute(@projects, params) @milestones = GlobalMilestone.build_collection(@milestones) @milestones = @milestones.sort_by { |x| x.due_date.nil? ? epoch : x.due_date } - @milestones = Kaminari.paginate_array(@milestones).page(params[:page]).per(ApplicationController::PER_PAGE) + @milestones = Kaminari.paginate_array(@milestones).page(params[:page]) end def milestone diff --git a/app/controllers/concerns/issues_action.rb b/app/controllers/concerns/issues_action.rb index ef8e74a4641..4feabc32b1c 100644 --- a/app/controllers/concerns/issues_action.rb +++ b/app/controllers/concerns/issues_action.rb @@ -3,7 +3,7 @@ module IssuesAction def issues @issues = get_issues_collection.non_archived - @issues = @issues.page(params[:page]).per(ApplicationController::PER_PAGE) + @issues = @issues.page(params[:page]) @issues = @issues.preload(:author, :project) @label = @issuable_finder.labels.first diff --git a/app/controllers/concerns/merge_requests_action.rb b/app/controllers/concerns/merge_requests_action.rb index 9c49596bd0b..06a6b065e7e 100644 --- a/app/controllers/concerns/merge_requests_action.rb +++ b/app/controllers/concerns/merge_requests_action.rb @@ -3,7 +3,7 @@ module MergeRequestsAction def merge_requests @merge_requests = get_merge_requests_collection.non_archived - @merge_requests = @merge_requests.page(params[:page]).per(ApplicationController::PER_PAGE) + @merge_requests = @merge_requests.page(params[:page]) @merge_requests = @merge_requests.preload(:author, :target_project) @label = @issuable_finder.labels.first |