Merge branch 'fix-branches-dropdown-initial-state' into 'master'

Fix branches page dropdown sort initial state ## What does this MR do? Add 'Name' as the initial state for the branches dropdown filter ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Prevent dropdown from being rendered without an initial state ## What are the relevant issue numbers? Closes #20753 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-10_at_2.26.59_PM](/uploads/e13725c90d1e870e0b08c3bff9234c4e/Screen_Shot_2016-08-10_at_2.26.59_PM.png) After: ![Screen_Shot_2016-08-10_at_2.26.45_PM](/uploads/cd4957902ee1ebb74ac6e93b18c8ed02/Screen_Shot_2016-08-10_at_2.26.45_PM.png) ## 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 !5761

Merge branch 'fix-branches-dropdown-initial-state' into 'master'
b6c9567a · Rémy Coutable · 87b07f6a · 88877afd · b6c9567a · b6c9567a
Commit b6c9567a authored Aug 11, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

branches_controller.rb app/controllers/projects/branches_controller.rb +2 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,7 @@ v 8.11.0 (unreleased)
  - Add "No one can push" as an option for protected branches. !5081
  - Improve performance of AutolinkFilter#text_parse by using XPath
  - Add experimental Redis Sentinel support !1877
+  - Fix branches page dropdown sort initial state (ClemMakesApps)
  - Environments have an url to link to
  - Update `timeago` plugin to use multiple string/locale settings
  - Remove unused images (ClemMakesApps)

--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
 class Projects::BranchesController < Projects::ApplicationController
  include ActionView::Helpers::SanitizeHelper
+  include SortingHelper
  # Authorize
  before_action :require_non_empty_project
  before_action :authorize_download_code!
  before_action :authorize_push_code!, only: [:new, :create, :destroy]

  def index
-    @sort = params[:sort].presence || 'name'
+    @sort = params[:sort].presence || sort_value_name
    @branches = BranchesFinder.new(@repository, params).execute
    @branches = Kaminari.paginate_array(@branches).page(params[:page])