diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-02 18:37:40 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-02 18:37:40 +0300 |
| commit | e4c20cd3fe330faa415493ee2fe30dc16fbaca80 (patch) | |
| tree | 0be61b6cc59cf35d81b9271c7603e0d8b203a31c /app/controllers/projects/branches_controller.rb | |
| parent | 25d6a6c4b528159c288995de4909e6a8da431d0b (diff) | |
| parent | 88958e5a9cd364ae36f3d2837982cedb9239c3bc (diff) | |
Merge branch 'master' into sidebar-fly-out-sub-nav
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 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]) |