Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 12 insertions, 5 deletions

diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb
index 4db14d5cc4d..b4ad9db815d 100644
--- a/app/helpers/sorting_helper.rb
+++ b/app/helpers/sorting_helper.rb
@@ -134,14 +134,14 @@ module SortingHelper
     )
   end
 
-  def milestone_sort_options_hash
+  def milestones_sort_options_hash
     {
-      sort_value_name             => sort_title_name_asc,
-      sort_value_name_desc        => sort_title_name_desc,
-      sort_value_due_date_later   => sort_title_due_date_later,
       sort_value_due_date_soon    => sort_title_due_date_soon,
+      sort_value_due_date_later   => sort_title_due_date_later,
+      sort_value_start_date_soon  => sort_title_start_date_soon,
       sort_value_start_date_later => sort_title_start_date_later,
-      sort_value_start_date_soon  => sort_title_start_date_soon
+      sort_value_name             => sort_title_name_asc,
+      sort_value_name_desc        => sort_title_name_desc
     }
   end
 
@@ -186,6 +186,13 @@ module SortingHelper
     }
   end
 
+  def runners_sort_options_hash
+    {
+      sort_value_created_date => sort_title_created_date,
+      sort_value_contacted_date => sort_title_contacted_date
+    }
+  end
+
   def starrers_sort_options_hash
     {
       sort_value_name => sort_title_name,