diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-10-04 18:21:19 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-10-04 18:21:19 +0300 |
| commit | 8ace5fc1889f12f4fa07abe80226b179049db952 (patch) | |
| tree | ae059a36e9a53bec57d73bff14105862165cbdce /app/controllers | |
| parent | f685c368eaa223035b9458b704cfd6ca768f0f7d (diff) | |
| parent | 8dd750e4f7bf599e5a65f14c14aec9236cae4220 (diff) | |
Merge branch '26890-fix-default-branches-sorting' into 'master'
Fix the default branches sorting to actually be 'Last updated'
Closes #26890
See merge request gitlab-org/gitlab-ce!14295
Diffstat (limited to 'app/controllers')
| -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| |