diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-08 03:10:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-08 03:10:44 +0300 |
| commit | d06b4740da9267bdfd42ab14c9893e3dd581f50d (patch) | |
| tree | 5012bc99ccb8ab92ed321bb33a0b51858594ce84 /app/models/concerns/issuable.rb | |
| parent | fd320d0858df108b47ebadaa546a3c99f0e44cf1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/issuable.rb')
| -rw-r--r-- | app/models/concerns/issuable.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index 2868e3ac80a..83ff5b16efe 100644 --- a/app/models/concerns/issuable.rb +++ b/app/models/concerns/issuable.rb @@ -352,12 +352,15 @@ module Issuable # # Returns an array of arel columns def grouping_columns(sort) + sort = sort.to_s grouping_columns = [arel_table[:id]] if %w(milestone_due_desc milestone_due_asc milestone).include?(sort) milestone_table = Milestone.arel_table grouping_columns << milestone_table[:id] grouping_columns << milestone_table[:due_date] + elsif %w(merged_at_desc merged_at_asc).include?(sort) + grouping_columns << MergeRequest::Metrics.arel_table[:merged_at] end grouping_columns |