Add latest changes from gitlab-org/gitlab@master

3 files changed, 7 insertions, 17 deletions

diff --git a/.gitlab/issue_templates/Coding style proposal.md b/.gitlab/issue_templates/Coding style proposal.md
index 1a3be44bea0..a969c9b72ee 100644
--- a/.gitlab/issue_templates/Coding style proposal.md
+++ b/.gitlab/issue_templates/Coding style proposal.md
@@ -11,6 +11,6 @@ Please describe the proposal and add a link to the source (for example, http://w
 
 /label ~"development guidelines"
 /label ~"Style decision"
-/label ~Documentation
+/label ~documentation
 
 /cc @gitlab-org/maintainers/rails-backend
diff --git a/.gitlab/issue_templates/Doc Review.md b/.gitlab/issue_templates/Doc Review.md
index 14ab0c82d59..5b470ed7c75 100644
--- a/.gitlab/issue_templates/Doc Review.md
+++ b/.gitlab/issue_templates/Doc Review.md
@@ -8,13 +8,13 @@
 
 ## References
 
-Merged MR that introduced documentation requiring review: 
+Merged MR that introduced documentation requiring review:
 
-Related issue(s): 
+Related issue(s):
 
 ## Further Details
 
 <!-- Any additional context, questions, or notes for the technical writer. -->
 
 
-/label ~Documentation ~docs-review
+/label ~documentation ~"Technical Writing"
diff --git a/.gitlab/issue_templates/Documentation.md b/.gitlab/issue_templates/Documentation.md
index f4070a44755..43ee7cd448b 100644
--- a/.gitlab/issue_templates/Documentation.md
+++ b/.gitlab/issue_templates/Documentation.md
@@ -2,23 +2,13 @@
 
 * Use this issue template for suggesting new docs or updates to existing docs.
   Note: Doc work as part of feature development is covered in the Feature Request template.
-  
+
 * For issues related to features of the docs.gitlab.com site, see
-     https://gitlab.com/gitlab-org/gitlab-docs/issues/       
+     https://gitlab.com/gitlab-org/gitlab-docs/issues/
 
 * For information about documentation content and process, see
      https://docs.gitlab.com/ee/development/documentation/ -->
 
-<!-- Type of issue -->
-
-<!-- Un-comment the line for the applicable doc issue type to add its label.
-     Note that all text on that line is deleted upon issue creation. -->
-<!-- /label ~"docs:fix" - Correction or clarification needed. -->
-<!-- /label ~"docs:new" - New doc needed to cover a new topic or use case. -->
-<!-- /label ~"docs:improvement" - Improving an existing doc; e.g. adding a diagram, adding or rewording text, resolving redundancies, cross-linking, etc. -->
-<!-- /label ~"docs:revamp" - Review a page or group of pages in order to plan and implement major improvements/rewrites. -->
-<!-- /label ~"docs:other" - Anything else. -->
-
 ### Problem to solve
 
 <!-- Include the following detail as necessary:
@@ -50,4 +40,4 @@
 
 <!-- E.g. related GitLab issues/MRs -->
 
-/label ~Documentation
+/label ~documentation