summaryrefslogtreecommitdiff
path: root/app/controllers/projects/branches_controller.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-07-28 15:27:49 +0000
committerRémy Coutable <remy@rymai.me>2017-07-28 15:27:49 +0000
commit6e3eec16c7dbe56ce27fa2283941a5f31ba3c16f (patch)
treeceb023bfd1866fd3a1d23450153fd5a38f0df4bf /app/controllers/projects/branches_controller.rb
parentbb23d462fa8bb270698e6e83c479884803658162 (diff)
parentb125fb4bcb637bd842db7d018d8f9c60303d9beb (diff)
downloadgitlab-ce-6e3eec16c7dbe56ce27fa2283941a5f31ba3c16f.tar.gz
Merge branch '26890-sort-branches' into 'master'
This makes the default sort order for branches 'recently updated' rather than by name. Closes #26890 See merge request !8666
Diffstat (limited to 'app/controllers/projects/branches_controller.rb')
-rw-r--r--app/controllers/projects/branches_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index 86058531179..747768eefb1 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -8,7 +8,7 @@ class Projects::BranchesController < Projects::ApplicationController
before_action :authorize_push_code!, only: [:new, :create, :destroy, :destroy_all_merged]
def index
- @sort = params[:sort].presence || sort_value_name
+ @sort = params[:sort].presence || sort_value_recently_updated
@branches = BranchesFinder.new(@repository, params).execute
@branches = Kaminari.paginate_array(@branches).page(params[:page])