Merge branch 'ee-fix-sort-weight' into 'master'

Fixed label resetting when sorting by weight

Closes gitlab-ce#30352

See merge request !1558

app/views/shared/_sort_dropdown.html.haml

@@ -20,9 +20,9 @@
       = link_to page_filter_path(sort: sort_value_oldest_updated, label: true) do
         = sort_title_oldest_updated
       - if local_assigns[:type] == :issues
-        = link_to page_filter_path(sort: sort_value_more_weight) do
+        = link_to page_filter_path(sort: sort_value_more_weight, label: true) do
           = sort_title_more_weight
-        = link_to page_filter_path(sort: sort_value_less_weight) do
+        = link_to page_filter_path(sort: sort_value_less_weight, label: true) do
           = sort_title_less_weight
       = link_to page_filter_path(sort: sort_value_milestone_soon, label: true) do
         = sort_title_milestone_soon

changelogs/unreleased-ee/ee-fix-sort-weight.yml

+---
+title: Fixed label resetting when sorting by weight
+merge_request:
+author: James Clark