diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-22 17:39:22 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-22 17:39:22 +0000 |
| commit | 3d66c88c61b5c66006cdbd37031c75644909ac1a (patch) | |
| tree | f1465d0ae5e4df3df30d612ae22f72178b9e2643 | |
| parent | cf020e66dff606f6ea2d2dbaeb7bef43d446c536 (diff) | |
| parent | 467b73377176518292e9fa41be5fdd33d76a55da (diff) | |
| download | gitlab-ce-3d66c88c61b5c66006cdbd37031c75644909ac1a.tar.gz | |
Merge branch 'branches-pagination' into '9-0-stable'
Branches pagination
See merge request !10145
| -rw-r--r-- | app/controllers/projects/branches_controller.rb | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/branches-pagination.yml | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index a3158825951..840405f38cb 100644 --- a/app/controllers/projects/branches_controller.rb +++ b/app/controllers/projects/branches_controller.rb @@ -10,7 +10,6 @@ class Projects::BranchesController < Projects::ApplicationController def index @sort = params[:sort].presence || sort_value_name @branches = BranchesFinder.new(@repository, params).execute - @branches = Kaminari.paginate_array(@branches).page(params[:page]) respond_to do |format| format.html do diff --git a/changelogs/unreleased/branches-pagination.yml b/changelogs/unreleased/branches-pagination.yml new file mode 100644 index 00000000000..46eb2816343 --- /dev/null +++ b/changelogs/unreleased/branches-pagination.yml @@ -0,0 +1,4 @@ +--- +title: Fixed branches pagination not displaying +merge_request: +author: |