diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-28 18:58:45 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-28 18:58:45 +0300 |
commit | b24ccd4a67f60731ce2eb6be0129e8cf7228263d (patch) | |
tree | 88c19b63e63a44fe39c12e83e3a68a0795f645fe /app/controllers | |
parent | 273bea975baabfbdcd831a0ff525f2ace48fb750 (diff) | |
parent | 94e6d51ec047fbf01cae2814003bba7ee2ff8546 (diff) |
Merge branch '20308-fix-title-that-is-show-in-the-dropdown-toggle-button-on-projects-branches' into 'master'
Fix the title of the toggle dropdown button
## What does this MR do?
Fix the dropdown-button toggle displaying the correctly title.
## Are there points in the code the reviewer needs to double check?
See if the title is displaying correctly and if the code is acceptable.
## Why was this MR needed?
When you choose `Last updated` it should display the title `Last updated` instead of `Recently updated`. This fix makes this correctly displays the title.
## What are the relevant issue numbers?
Closes #20308.
## Screenshots (if relevant)
![filter-gitlab-ce](/uploads/52838679d134d57c6ff6120260806fda/filter-gitlab-ce.gif)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5515
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/branches_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb index 6126acccaab..e926043f3eb 100644 --- a/app/controllers/projects/branches_controller.rb +++ b/app/controllers/projects/branches_controller.rb @@ -6,6 +6,7 @@ class Projects::BranchesController < Projects::ApplicationController before_action :authorize_push_code!, only: [:new, :create, :destroy] def index + @sort = params[:sort].presence || 'name' @branches = BranchesFinder.new(@repository, params).execute @branches = Kaminari.paginate_array(@branches).page(params[:page]) |