summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Tickett <lee@tickett.net>2019-09-04 03:51:43 +0000
committerMike Greiling <mike@pixelcog.com>2019-09-04 03:51:43 +0000
commit09c7044f08becf78c8e154f55b515a6f25f0a7df (patch)
treed4fb0e776547757eecc3dc23262d4ff956e625c5
parent383ad8d67fe96f9b33eeac8aac338f038735ca0d (diff)
downloadgitlab-ce-09c7044f08becf78c8e154f55b515a6f25f0a7df.tar.gz
Revert "DB change, migratoin and changelog"
This reverts commit af5242ecb682189c5d8276e1ab1ffe5ce844f2e5.
-rw-r--r--app/views/shared/empty_states/_priority_labels.html.haml4
-rw-r--r--changelogs/unreleased/change-prioritized-labels-empty-state-message.yml5
-rw-r--r--locale/gitlab.pot3
3 files changed, 11 insertions, 1 deletions
diff --git a/app/views/shared/empty_states/_priority_labels.html.haml b/app/views/shared/empty_states/_priority_labels.html.haml
index bba3475d244..a93f6e4c795 100644
--- a/app/views/shared/empty_states/_priority_labels.html.haml
+++ b/app/views/shared/empty_states/_priority_labels.html.haml
@@ -1,4 +1,6 @@
.text-center
.svg-content.qa-label-svg
= image_tag 'illustrations/priority_labels.svg'
- %p Star labels to start sorting by priority
+ - if can?(current_user, :admin_label, @project)
+ %p
+ = _("Star labels to start sorting by priority")
diff --git a/changelogs/unreleased/change-prioritized-labels-empty-state-message.yml b/changelogs/unreleased/change-prioritized-labels-empty-state-message.yml
new file mode 100644
index 00000000000..d5df889d15c
--- /dev/null
+++ b/changelogs/unreleased/change-prioritized-labels-empty-state-message.yml
@@ -0,0 +1,5 @@
+---
+title: Change prioritized labels empty state message
+merge_request: 32338
+author: Lee Tickett
+type: other
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 167b6783073..629daccf006 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -10882,6 +10882,9 @@ msgstr ""
msgid "Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging."
msgstr ""
+msgid "Star labels to start sorting by priority"
+msgstr ""
+
msgid "Star toggle failed. Try again later."
msgstr ""