Add latest changes from gitlab-org/gitlab@master

6 files changed, 36 insertions, 7 deletions

diff --git a/doc/user/project/img/promote_to_parent_group_workaround_v14_10.png b/doc/user/project/img/promote_to_parent_group_workaround_v14_10.png
new file mode 100644
index 00000000000..ed4ac9ba234
--- /dev/null
+++ b/doc/user/project/img/promote_to_parent_group_workaround_v14_10.png
diff --git a/doc/user/project/import/bitbucket.md b/doc/user/project/import/bitbucket.md
index 8c0d9fc422b..b2425686024 100644
--- a/doc/user/project/import/bitbucket.md
+++ b/doc/user/project/import/bitbucket.md
@@ -49,7 +49,7 @@ The importer will create any new namespaces (groups) if they don't exist or in
 the case the namespace is taken, the repository will be imported under the user's
 namespace that started the import process.
 
-## Requirements for user-mapped contributions 
+## Requirements for user-mapped contributions
 
 For user contributions to be mapped, each user must complete the following before the project import:
 
@@ -83,7 +83,7 @@ For user contributions to be mapped, each user must complete the following befor
 
 ### If you have more than one Bitbucket account
 
-Be sure to sign in to the correct account. 
+Be sure to sign in to the correct account.
 
 If you've accidentally started the import process with the wrong account, follow these steps:
 
diff --git a/doc/user/project/integrations/harbor.md b/doc/user/project/integrations/harbor.md
index 0c0743476fb..2a1b12057aa 100644
--- a/doc/user/project/integrations/harbor.md
+++ b/doc/user/project/integrations/harbor.md
@@ -45,7 +45,7 @@ After the Harbor integration is activated:
 ## Secure your requests to the Harbor APIs
 
 For each API request through the Harbor integration, the credentials for your connection to the Harbor API use
-the `username:password` combination. The following are suggestions for safe use: 
+the `username:password` combination. The following are suggestions for safe use:
 
 - Use TLS on the Harbor APIs you connect to.
 - Follow the principle of least privilege (for access on Harbor) with your credentials.
diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md
index aee052aeaa1..f4f5b3f545b 100644
--- a/doc/user/project/integrations/webhooks.md
+++ b/doc/user/project/integrations/webhooks.md
@@ -246,7 +246,7 @@ To view the table:
    - **Fails to connect** if it is temporarily disabled and will retry later.
   
    ![Badges on failing webhooks](img/failed_badges.png)
-   
+
 1. Select **Edit** for the webhook you want to view.
 
 The table includes the following details about each request:
diff --git a/doc/user/project/labels.md b/doc/user/project/labels.md
index 18197cd860f..34bfed22ae4 100644
--- a/doc/user/project/labels.md
+++ b/doc/user/project/labels.md
@@ -253,6 +253,35 @@ with the old labels are assigned to the new group label.
 
 The new group label has the same ID as the previous project label.
 
+## Promote a subgroup label to the parent group
+
+It's not possible to directly promote a group label to the parent group.
+To achieve this, use the following workaround.
+
+Prerequisites:
+
+- There must be a group that contains subgroups ("parent group").
+- There must be a subgroup in the parent group, that has a label you want to promote.
+- You must have at least the Reporter role for both groups.
+
+To "promote" the label to the parent group:
+
+1. In the parent group, [create a label](#create-a-group-label) with the same name as the original
+   one. We recommend making it a different color so you don't mistake the two while you're doing this.
+1. In the subgroup, [view its labels](#view-group-labels). You should see the two labels and where
+   they come from:
+
+   ![parent group and subgroup labels in the subgroup's label list](img/promote_to_parent_group_workaround_v14_10.png)
+
+1. Next to the subgroup label (the old one), select **Issues**, **Merge requests**, or **Epics**.
+1. Add the new label to issues, merge requests, and epics that have the old label.
+   To do it faster, use [bulk editing](issues/managing_issues.md#bulk-edit-issues-from-a-group).
+1. In the subgroup or the parent group, [delete the label](#delete-a-group-label) that belongs to
+   the lower-level group.
+
+You should now have a label in the parent group that is named the same as the old one, and added
+to the same issues, MRs, and epics.
+
 ## Generate default project labels
 
 If a project or its parent group has no labels, you can generate a default set of project
diff --git a/doc/user/project/working_with_projects.md b/doc/user/project/working_with_projects.md
index 93e090354cd..f25f6c344a2 100644
--- a/doc/user/project/working_with_projects.md
+++ b/doc/user/project/working_with_projects.md
@@ -79,9 +79,9 @@ To create a project in GitLab:
      from a different repository. Contact your GitLab administrator if this option is not available.
    - [Connect an external repository to GitLab CI/CD](../../ci/ci_cd_for_external_repos/index.md).
 
-- For a list of words that you cannot use as project names, see 
+- For a list of words that you cannot use as project names, see
   [reserved project and group names](../../user/reserved_names.md).
-- For a list of characters that you cannot use in project and group names, see 
+- For a list of characters that you cannot use in project and group names, see
   [limitations on project and group names](../../user/reserved_names.md#limitations-on-project-and-group-names).
 
 ## Create a blank project
@@ -299,7 +299,7 @@ To delete a project:
 > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/351556) in GitLab 14.9. [Feature flag `project_owners_list_project_pending_deletion`](https://gitlab.com/gitlab-org/gitlab/-/issues/351556) removed.
 
 When delayed project deletion is [enabled for a group](../group/index.md#enable-delayed-project-deletion),
-projects within that group are not deleted immediately, but only after a delay. 
+projects within that group are not deleted immediately, but only after a delay.
 
 To view a list of all projects that are pending deletion: