Merge branch 'issue_24958' into 'master'

Fix bad selection on dropdown menu for tags filter

Fixes #24958

See merge request !7750

app/views/projects/tags/index.html.haml

@@ -10,15 +10,16 @@
     .nav-controls
       = form_tag(filter_tags_path, method: :get) do
         = search_field_tag :search, params[:search], { placeholder: 'Filter by tag name', id: 'tag-search', class: 'form-control search-text-input input-short', spellcheck: false }
+
       .dropdown.inline
         %button.dropdown-toggle.btn{ type: 'button', data: { toggle: 'dropdown'} }
           %span.light
-            = @sort.humanize
+            = projects_sort_options_hash[@sort]
           = icon('caret-down')
         %ul.dropdown-menu.dropdown-menu-align-right
           %li
-            = link_to filter_tags_path(sort: nil) do
-              Name
+            = link_to filter_tags_path(sort: sort_value_name) do
+              = sort_title_name
             = link_to filter_tags_path(sort: sort_value_recently_updated) do
               = sort_title_recently_updated
             = link_to filter_tags_path(sort: sort_value_oldest_updated) do

changelogs/unreleased/issue_24958.yml

+---
+title: Fix bad selection on dropdown menu for tags filter
+merge_request: 
+author: Luis Alonso Chavez Armendariz