diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-02 03:08:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-02 03:08:51 +0300 |
commit | 5da5ddb5ae9a39ca557ea63731add049f3da6c0b (patch) | |
tree | 9df51902c8d279471c26bdda922ab3fbc5705efc /.gitlab | |
parent | 46524bb8535aa776981d94c6c075f93e58378a0c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
-rw-r--r-- | .gitlab/issue_templates/Security Release Tracking Issue.md | 2 | ||||
-rw-r--r-- | .gitlab/merge_request_templates/Documentation.md | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.gitlab/issue_templates/Security Release Tracking Issue.md b/.gitlab/issue_templates/Security Release Tracking Issue.md index d2de7462ecb..fce68d61204 100644 --- a/.gitlab/issue_templates/Security Release Tracking Issue.md +++ b/.gitlab/issue_templates/Security Release Tracking Issue.md @@ -31,7 +31,7 @@ Your Security Implementation Issue should have `4` merge requests associated: ## Blog post -Dev: {https://dev.gitlab.org/gitlab/www-gitlab-com/merge_requests/ link}<br/> +Security: {https://gitlab.com/gitlab-org/security/www-gitlab-com/merge_requests/ link}<br/> GitLab.com: {https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/ link} ## Email notification diff --git a/.gitlab/merge_request_templates/Documentation.md b/.gitlab/merge_request_templates/Documentation.md index b17043fd3b9..8713405033b 100644 --- a/.gitlab/merge_request_templates/Documentation.md +++ b/.gitlab/merge_request_templates/Documentation.md @@ -48,10 +48,13 @@ All reviewers can help ensure accuracy, clarity, completeness, and adherence to - [ ] 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/product-categories/#devops-stages). - [ ] Ensure docs metadata are present and up-to-date. - [ ] Ensure ~"Technical Writing" and ~"documentation" are added. - - [ ] Add the corresponding `docs::` scoped label. + - [ ] Add the corresponding `docs::` [scoped label](https://gitlab.com/groups/gitlab-org/-/labels?utf8=%E2%9C%93&subscribed=&search=docs%3A%3A). + - [ ] If working on UI text, add the corresponding `UI Text` [scoped label](https://gitlab.com/groups/gitlab-org/-/labels?utf8=%E2%9C%93&subscribed=&search=ui+text). - [ ] Add ~"tw::doing" when starting work on the MR. - [ ] Add ~"tw::finished" if Technical Writing team work on the MR is complete but it remains open. +For more information about labels, see [Technical Writing workflows - Labels](https://about.gitlab.com/handbook/engineering/ux/technical-writing/workflow/#labels). + **3. Maintainer** 1. [ ] Review by assigned maintainer, who can always request/require the above reviews. Maintainer's review can occur before or after a technical writer review. |