Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f4bf7be9
Commit
f4bf7be9
authored
Jul 02, 2021
by
Eulyeon Ko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply backend maintainer suggestions
- Convert the sort argument to string so symbol can be additionally used.
parent
3f30232f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/models/milestone.rb
app/models/milestone.rb
+2
-2
No files found.
app/models/milestone.rb
View file @
f4bf7be9
...
...
@@ -120,11 +120,11 @@ class Milestone < ApplicationRecord
sorted
.
with_order_id_desc
end
def
self
.
sort_with_expired_last
(
sort_by
)
def
self
.
sort_with_expired_last
(
method
)
# NOTE: this is a custom ordering of milestones
# to prioritize displaying non-expired milestones and milestones without due dates
sorted
=
reorder
(
Arel
.
sql
(
'(CASE WHEN due_date IS NULL THEN 1 WHEN due_date > now() THEN 0 ELSE 2 END) ASC'
))
sorted
=
if
sort_by
==
:expired_last_due_date_desc
sorted
=
if
method
.
to_s
==
'expired_last_due_date_desc'
sorted
.
order
(
due_date: :desc
)
else
sorted
.
order
(
due_date: :asc
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment