Automatic merge of gitlab-org/gitlab-ce master

aaf08b8a · GitLab Bot · 4e50680d · 1a83d938 · aaf08b8a · aaf08b8a
Commit aaf08b8a authored Jan 02, 2019 by GitLab Bot
Showing with 6 additions and 1 deletion

app/helpers/sorting_helper.rb app/helpers/sorting_helper.rb +1 -1

changelogs/unreleased/55369-update-milestone-sort-to-say-say-milestone-due-date.yml ...9-update-milestone-sort-to-say-say-milestone-due-date.yml +5 -0

No files found.
--- a/app/helpers/sorting_helper.rb
+++ b/app/helpers/sorting_helper.rb
@@ -236,7 +236,7 @@ module SortingHelper
  end

  def sort_title_milestone
-    s_('SortOptions|Milestone')
+    s_('SortOptions|Milestone due date')
  end

  def sort_title_milestone_later

--- a/changelogs/unreleased/55369-update-milestone-sort-to-say-say-milestone-due-date.yml
+++ b/changelogs/unreleased/55369-update-milestone-sort-to-say-say-milestone-due-date.yml
+---
+title: Renames Milestone sort into Milestone due date
+merge_request: 24080
+author: Jacopo Beschi @jacopo-beschi
+type: changed