Commit ce34e2d4 authored by Mike Greiling's avatar Mike Greiling

Merge branch '212710-improve-message-when-promoting-labels' into 'master'

Improve message when promoting labels

See merge request gitlab-org/gitlab!28265
parents febf5782 5798327d
...@@ -37,7 +37,8 @@ export default { ...@@ -37,7 +37,8 @@ export default {
text() { text() {
return sprintf( return sprintf(
s__(`Labels|Promoting %{labelTitle} will make it available for all projects inside %{groupName}. s__(`Labels|Promoting %{labelTitle} will make it available for all projects inside %{groupName}.
Existing project labels with the same title will be merged. This action cannot be reversed.`), Existing project labels with the same title will be merged. If a group label with the same title exists,
it will also be merged. This action cannot be reversed.`),
{ {
labelTitle: this.labelTitle, labelTitle: this.labelTitle,
groupName: this.groupName, groupName: this.groupName,
......
---
title: Improve message when promoting project labels
merge_request: 28265
author:
type: other
...@@ -74,9 +74,14 @@ and selecting **Delete**. ...@@ -74,9 +74,14 @@ and selecting **Delete**.
#### Promote a project label to a group label #### Promote a project label to a group label
If you previously created a project label and now want to make it available for other If you previously created a project label and now want to make it available for other
projects within the same group, you can promote it to a group label. If other projects projects within the same group, you can promote it to a group label.
in the same group have a label with the same name, they will all be overwritten by
the new group label. If other projects in the same group have a label with the same title, they will all be
merged with the new group label. If a group label with the same title exists, it will
also be merged.
All issues, merge requests, issue board lists, issue board filters, and label subscriptions
with the old labels will be assigned to the new group label.
WARNING: **Caution:** WARNING: **Caution:**
Promoting a label is a permanent action, and cannot be reversed. Promoting a label is a permanent action, and cannot be reversed.
......
...@@ -11599,7 +11599,7 @@ msgstr "" ...@@ -11599,7 +11599,7 @@ msgstr ""
msgid "Labels|Promote Label" msgid "Labels|Promote Label"
msgstr "" msgstr ""
msgid "Labels|Promoting %{labelTitle} will make it available for all projects inside %{groupName}. Existing project labels with the same title will be merged. This action cannot be reversed." msgid "Labels|Promoting %{labelTitle} will make it available for all projects inside %{groupName}. Existing project labels with the same title will be merged. If a group label with the same title exists, it will also be merged. This action cannot be reversed."
msgstr "" msgstr ""
msgid "Labels|and %{count} more" msgid "Labels|and %{count} more"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment