diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 09:08:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 09:08:42 +0000 |
| commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
| tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /app/helpers/sorting_helper.rb | |
| parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) | |
| download | gitlab-ce-b76ae638462ab0f673e5915986070518dd3f9ad3.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'app/helpers/sorting_helper.rb')
| -rw-r--r-- | app/helpers/sorting_helper.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb index da32dfb0b9b..7fa85d143f7 100644 --- a/app/helpers/sorting_helper.rb +++ b/app/helpers/sorting_helper.rb @@ -3,6 +3,7 @@ module SortingHelper include SortingTitlesValuesHelper + # rubocop: disable Metrics/AbcSize def sort_options_hash { sort_value_created_date => sort_title_created_date, @@ -29,6 +30,9 @@ module SortingHelper 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_closed_date => sort_title_closed_date, + sort_value_closed_recently => sort_title_closed_recently, + sort_value_closed_earlier => sort_title_closed_earlier, sort_value_upvotes => sort_title_upvotes, sort_value_contacted_date => sort_title_contacted_date, sort_value_relative_position => sort_title_relative_position, @@ -36,6 +40,7 @@ module SortingHelper sort_value_expire_date => sort_title_expire_date } end + # rubocop: enable Metrics/AbcSize def projects_sort_options_hash use_old_sorting = Feature.disabled?(:project_list_filter_bar) || current_controller?('admin/projects') @@ -182,6 +187,7 @@ module SortingHelper 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_closed_recently => sort_value_closed_date, sort_value_least_popular => sort_value_popularity } end @@ -196,6 +202,8 @@ module SortingHelper 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_closed_date => sort_value_closed_recently, + sort_value_closed_earlier => sort_value_closed_recently, sort_value_popularity => sort_value_least_popular, sort_value_most_popular => sort_value_least_popular }.merge(issuable_sort_option_overrides) @@ -216,7 +224,7 @@ module SortingHelper def sort_direction_icon(sort_value) case sort_value - when sort_value_milestone, sort_value_due_date, sort_value_merged_date, /_asc\z/ + when sort_value_milestone, sort_value_due_date, sort_value_merged_date, sort_value_closed_date, /_asc\z/ 'sort-lowest' else 'sort-highest' |