Automatic merge of gitlab-org/gitlab-ce master

app/helpers/sorting_helper.rb

@@ -144,7 +144,9 @@ module SortingHelper
     {
       sort_value_oldest_created => sort_value_created_date,
       sort_value_oldest_updated => sort_value_recently_updated,
-      sort_value_milestone_later => sort_value_milestone
+      sort_value_milestone_later => sort_value_milestone,
+      sort_value_due_date_later => sort_value_due_date,
+      sort_value_least_popular => sort_value_popularity
     }
   end
 
@@ -153,7 +155,11 @@ module SortingHelper
       sort_value_created_date => sort_value_oldest_created,
       sort_value_recently_created => sort_value_oldest_created,
       sort_value_recently_updated => sort_value_oldest_updated,
-      sort_value_milestone => sort_value_milestone_later
+      sort_value_milestone => sort_value_milestone_later,
+      sort_value_due_date => sort_value_due_date_later,
+      sort_value_due_date_soon => sort_value_due_date_later,
+      sort_value_popularity => sort_value_least_popular,
+      sort_value_most_popular => sort_value_least_popular
     }.merge(issuable_sort_option_overrides)
   end
 
@@ -422,6 +428,14 @@ module SortingHelper
     'popularity'
   end
 
+  def sort_value_most_popular
+    'popularity_desc'
+  end
+
+  def sort_value_least_popular
+    'popularity_asc'
+  end
+
   def sort_value_priority
     'priority'
   end

changelogs/unreleased/50926-sort-by-due-date-and-popularity.yml

+---
+title: Sort by due date and popularity in both directions for Issues and Merge requests
+merge_request: 25502
+author: Nermin Vehabovic
+type: changed

spec/features/issuables/sorting_list_spec.rb

@@ -86,6 +86,7 @@ describe 'Sort Issuable List' do
           expect(last_merge_request).to include(first_created_issuable.title)
         end
       end
+    end
 
     context 'custom sorting' do
       let(:issuable_type) { :merge_request }
@@ -108,7 +109,6 @@ describe 'Sort Issuable List' do
       end
     end
   end
-  end
 
   context 'for issues' do
     include IssueHelpers