diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-15 13:25:12 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-25 19:06:51 +0200 |
| commit | 8dd750e4f7bf599e5a65f14c14aec9236cae4220 (patch) | |
| tree | 9c5f057e6ca2e0ae74cf8bd4e5a3363d82911d01 /app/controllers/projects/branches_controller.rb | |
| parent | b83dcd3a30539f86b13d91ffd24fb708652eae80 (diff) | |
| download | gitlab-ce-8dd750e4f7bf599e5a65f14c14aec9236cae4220.tar.gz | |
Fix the default branches sorting to actually be 'Last updated'26890-fix-default-branches-sorting
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/controllers/projects/branches_controller.rb')
| -rw-r--r-- | app/controllers/projects/branches_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index a9cce578366..7f03ce07dec 100644 --- a/app/controllers/projects/branches_controller.rb +++ b/app/controllers/projects/branches_controller.rb @@ -9,7 +9,7 @@ class Projects::BranchesController < Projects::ApplicationController def index @sort = params[:sort].presence || sort_value_recently_updated - @branches = BranchesFinder.new(@repository, params).execute + @branches = BranchesFinder.new(@repository, params.merge(sort: @sort)).execute @branches = Kaminari.paginate_array(@branches).page(params[:page]) respond_to do |format| |