Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-01-02 13:21:45 +0300
committerSean McGivern <sean@gitlab.com>2019-01-02 13:21:45 +0300
commit1a83d9387f6db91f2adae5c3d66c6e21077967bc (patch)
treea595e1a4a06229382157b87f1cfd7d5108f5a4d4
parentf93f09e7355b7cc3522797ee288d79d3b2e90ea0 (diff)
parent1c91d042b596e3c0940df3c6167f2e628c102f61 (diff)
Merge branch '55369-update-milestone-sort-to-say-say-milestone-due-date' into 'master'
Resolve "Update `Milestone` sort to say say `Milestone due date`" Closes #55369 See merge request gitlab-org/gitlab-ce!24080
-rw-r--r--app/helpers/sorting_helper.rb2
-rw-r--r--changelogs/unreleased/55369-update-milestone-sort-to-say-say-milestone-due-date.yml5
-rw-r--r--locale/gitlab.pot2
3 files changed, 7 insertions, 2 deletions
diff --git a/app/helpers/sorting_helper.rb b/app/helpers/sorting_helper.rb
index 6ac1f42c321..02762897c89 100644
--- a/app/helpers/sorting_helper.rb
+++ b/app/helpers/sorting_helper.rb
@@ -234,7 +234,7 @@ module SortingHelper
end
def sort_title_milestone
- s_('SortOptions|Milestone')
+ s_('SortOptions|Milestone due date')
end
def sort_title_milestone_later
diff --git 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
new file mode 100644
index 00000000000..7476b9caa93
--- /dev/null
+++ b/changelogs/unreleased/55369-update-milestone-sort-to-say-say-milestone-due-date.yml
@@ -0,0 +1,5 @@
+---
+title: Renames Milestone sort into Milestone due date
+merge_request: 24080
+author: Jacopo Beschi @jacopo-beschi
+type: changed
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 67be52d8810..ddfd5599883 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -6242,7 +6242,7 @@ msgstr ""
msgid "SortOptions|Least popular"
msgstr ""
-msgid "SortOptions|Milestone"
+msgid "SortOptions|Milestone due date"
msgstr ""
msgid "SortOptions|Milestone due later"