summaryrefslogtreecommitdiff
path: root/.gitlab/merge_request_templates
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-23 06:06:19 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-23 06:06:19 +0000
commit89861e72b7375353654513aa2bc0a3b60a5e4377 (patch)
tree60e5424a064977a346eaf5f06720dc74af54d720 /.gitlab/merge_request_templates
parent98dbb0a488d7b0093f352938210d9578b0f7a8a6 (diff)
downloadgitlab-ce-89861e72b7375353654513aa2bc0a3b60a5e4377.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/merge_request_templates')
-rw-r--r--.gitlab/merge_request_templates/Change documentation location.md6
-rw-r--r--.gitlab/merge_request_templates/Documentation.md6
2 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab/merge_request_templates/Change documentation location.md b/.gitlab/merge_request_templates/Change documentation location.md
index 7dc80a641c4..f18957fdaaa 100644
--- a/.gitlab/merge_request_templates/Change documentation location.md
+++ b/.gitlab/merge_request_templates/Change documentation location.md
@@ -10,12 +10,12 @@
<!-- Mention the issue(s) this MR closes or is related to -->
-Closes
+Closes
## Moving docs to a new location?
Read the guidelines:
-https://docs.gitlab.com/ce/development/documentation/index.html#changing-document-location
+https://docs.gitlab.com/ee/development/documentation/index.html#changing-document-location
- [ ] Make sure the old link is not removed and has its contents replaced with
a link to the new location.
@@ -29,4 +29,4 @@ https://docs.gitlab.com/ce/development/documentation/index.html#changing-documen
with the changes as well (https://docs.gitlab.com/ce/development/documentation/index.html#cherry-picking-from-ce-to-ee).
- [ ] Ping one of the technical writers for review.
-/label ~Documentation
+/label ~documentation
diff --git a/.gitlab/merge_request_templates/Documentation.md b/.gitlab/merge_request_templates/Documentation.md
index e502614b5ca..89eb716852e 100644
--- a/.gitlab/merge_request_templates/Documentation.md
+++ b/.gitlab/merge_request_templates/Documentation.md
@@ -1,5 +1,5 @@
<!-- Follow the documentation workflow https://docs.gitlab.com/ee/development/documentation/workflow.html -->
-<!-- Additional information is located at https://docs.gitlab.com/ee/development/documentation/ -->
+<!-- Additional information is located at https://docs.gitlab.com/ee/development/documentation/ -->
<!-- Mention "documentation" or "docs" in the MR title -->
<!-- For changing documentation location use the "Change documentation location" template -->
@@ -26,7 +26,7 @@ All reviewers can help ensure accuracy, clarity, completeness, and adherence to
**1. Primary Reviewer**
* [ ] Review by a code reviewer or other selected colleague to confirm accuracy, clarity, and completeness. This can be skipped for minor fixes without substantive content changes.
-
+
**2. Technical Writer**
* [ ] Optional: Technical writer review. If not requested for this MR, must be scheduled post-merge. To request for this MR, assign the writer listed for the applicable [DevOps stage](https://about.gitlab.com/handbook/product/categories/#devops-stages).
@@ -37,4 +37,4 @@ All reviewers can help ensure accuracy, clarity, completeness, and adherence to
1. [ ] Ensure a release milestone is set and that you merge the equivalent EE MR before the CE MR if both exist.
1. [ ] If there has not been a technical writer review, [create an issue for one using the Doc Review template](https://gitlab.com/gitlab-org/gitlab-ce/issues/new?issuable_template=Doc%20Review).
-/label ~Documentation
+/label ~documentation