From e4c711546c693fff89b0b1c92f1b0dde927e0c84 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 18 Sep 2019 21:06:34 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/helpers/sorting_helper.rb | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'app/helpers/sorting_helper.rb') diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb index d680e10525d..33f3bb0b749 100644 --- a/app/helpers/sorting_helper.rb +++ b/app/helpers/sorting_helper.rb @@ -28,7 +28,9 @@ module SortingHelper sort_value_priority => sort_title_priority, sort_value_upvotes => sort_title_upvotes, sort_value_contacted_date => sort_title_contacted_date, - sort_value_relative_position => sort_title_relative_position + sort_value_relative_position => sort_title_relative_position, + sort_value_size => sort_title_size, + sort_value_expire_date => sort_title_expire_date } end @@ -406,6 +408,14 @@ module SortingHelper s_('SortOptions|Manual') end + def sort_title_size + s_('SortOptions|Size') + end + + def sort_title_expire_date + s_('SortOptions|Expired date') + end + # Values. def sort_value_access_level_asc 'access_level_asc' @@ -558,4 +568,12 @@ module SortingHelper def sort_value_relative_position 'relative_position' end + + def sort_value_size + 'size_desc' + end + + def sort_value_expire_date + 'expired_asc' + end end -- cgit v1.2.3