summaryrefslogtreecommitdiff
path: root/app/models/release.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-12-23 18:10:19 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-23 18:10:19 +0000
commitb8d021cb606ac86f41a0ef9dacd133a9677f8414 (patch)
treeaee1c216ff06acc7e3587a9a28af95f0392734f4 /app/models/release.rb
parent9dbca64417abbec779a219b9e0df9d289d945032 (diff)
downloadgitlab-ce-b8d021cb606ac86f41a0ef9dacd133a9677f8414.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/release.rb')
-rw-r--r--app/models/release.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/release.rb b/app/models/release.rb
index bebf91fb247..2b82fdc37f6 100644
--- a/app/models/release.rb
+++ b/app/models/release.rb
@@ -82,7 +82,7 @@ class Release < ApplicationRecord
end
def milestone_titles
- self.milestones.map {|m| m.title }.sort.join(", ")
+ self.milestones.order_by_dates_and_title.map {|m| m.title }.join(', ')
end
def to_hook_data(action)