Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/helpers/sorting_titles_values_helper.rb')
-rw-r--r--app/helpers/sorting_titles_values_helper.rb56
1 files changed, 24 insertions, 32 deletions
diff --git a/app/helpers/sorting_titles_values_helper.rb b/app/helpers/sorting_titles_values_helper.rb
index 28d70f1db45..9b839f4e9bc 100644
--- a/app/helpers/sorting_titles_values_helper.rb
+++ b/app/helpers/sorting_titles_values_helper.rb
@@ -2,14 +2,6 @@
module SortingTitlesValuesHelper
# Titles.
- def sort_title_access_level_asc
- s_('SortOptions|Access level, ascending')
- end
-
- def sort_title_access_level_desc
- s_('SortOptions|Access level, descending')
- end
-
def sort_title_created_date
s_('SortOptions|Created date')
end
@@ -34,6 +26,18 @@ module SortingTitlesValuesHelper
s_('SortOptions|Label priority')
end
+ def sort_title_merged_date
+ s_('SortOptions|Merged date')
+ end
+
+ def sort_title_merged_recently
+ s_('SortOptions|Merged recently')
+ end
+
+ def sort_title_merged_earlier
+ s_('SortOptions|Merged earlier')
+ end
+
def sort_title_largest_group
s_('SortOptions|Largest group')
end
@@ -42,10 +46,6 @@ module SortingTitlesValuesHelper
s_('SortOptions|Largest repository')
end
- def sort_title_last_joined
- s_('SortOptions|Last joined')
- end
-
def sort_title_latest_activity
s_('SortOptions|Last updated')
end
@@ -82,10 +82,6 @@ module SortingTitlesValuesHelper
s_('SortOptions|Oldest created')
end
- def sort_title_oldest_joined
- s_('SortOptions|Oldest joined')
- end
-
def sort_title_oldest_signin
s_('SortOptions|Oldest sign in')
end
@@ -167,14 +163,6 @@ module SortingTitlesValuesHelper
end
# Values.
- def sort_value_access_level_asc
- 'access_level_asc'
- end
-
- def sort_value_access_level_desc
- 'access_level_desc'
- end
-
def sort_value_created_date
'created_date'
end
@@ -199,6 +187,18 @@ module SortingTitlesValuesHelper
'label_priority'
end
+ def sort_value_merged_date
+ 'merged_at'
+ end
+
+ def sort_value_merged_recently
+ 'merged_at_desc'
+ end
+
+ def sort_value_merged_earlier
+ 'merged_at_asc'
+ end
+
def sort_value_largest_group
'storage_size_desc'
end
@@ -207,10 +207,6 @@ module SortingTitlesValuesHelper
'storage_size_desc'
end
- def sort_value_last_joined
- 'last_joined'
- end
-
def sort_value_latest_activity
'latest_activity_desc'
end
@@ -247,10 +243,6 @@ module SortingTitlesValuesHelper
'oldest_sign_in'
end
- def sort_value_oldest_joined
- 'oldest_joined'
- end
-
def sort_value_oldest_updated
'updated_asc'
end