diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
| commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
| tree | c42be41678c2586d49a75cabce89322082698334 /app/helpers/sorting_helper.rb | |
| parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/helpers/sorting_helper.rb')
| -rw-r--r-- | app/helpers/sorting_helper.rb | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb index 0bb9e9e9bdd..da32dfb0b9b 100644 --- a/app/helpers/sorting_helper.rb +++ b/app/helpers/sorting_helper.rb @@ -26,6 +26,9 @@ module SortingHelper sort_value_recently_updated => sort_title_recently_updated, sort_value_popularity => sort_title_popularity, sort_value_priority => sort_title_priority, + sort_value_merged_date => sort_title_merged_date, + sort_value_merged_recently => sort_title_merged_recently, + sort_value_merged_earlier => sort_title_merged_earlier, sort_value_upvotes => sort_title_upvotes, sort_value_contacted_date => sort_title_contacted_date, sort_value_relative_position => sort_title_relative_position, @@ -168,19 +171,6 @@ module SortingHelper } end - def member_sort_options_hash - { - sort_value_access_level_asc => sort_title_access_level_asc, - sort_value_access_level_desc => sort_title_access_level_desc, - sort_value_last_joined => sort_title_last_joined, - sort_value_name => sort_title_name_asc, - sort_value_name_desc => sort_title_name_desc, - sort_value_oldest_joined => sort_title_oldest_joined, - sort_value_oldest_signin => sort_title_oldest_signin, - sort_value_recently_signin => sort_title_recently_signin - } - end - def sortable_item(item, path, sorted_by) link_to item, path, class: sorted_by == item ? 'is-active' : '' end @@ -191,6 +181,7 @@ module SortingHelper sort_value_oldest_updated => sort_value_recently_updated, sort_value_milestone_later => sort_value_milestone, sort_value_due_date_later => sort_value_due_date, + sort_value_merged_recently => sort_value_merged_date, sort_value_least_popular => sort_value_popularity } end @@ -203,6 +194,8 @@ module SortingHelper 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_merged_date => sort_value_merged_recently, + sort_value_merged_earlier => sort_value_merged_recently, sort_value_popularity => sort_value_least_popular, sort_value_most_popular => sort_value_least_popular }.merge(issuable_sort_option_overrides) @@ -223,7 +216,7 @@ module SortingHelper def sort_direction_icon(sort_value) case sort_value - when sort_value_milestone, sort_value_due_date, /_asc\z/ + when sort_value_milestone, sort_value_due_date, sort_value_merged_date, /_asc\z/ 'sort-lowest' else 'sort-highest' |