diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-20 21:12:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-20 21:12:04 +0300 |
| commit | bca3fb69e1e43c345ccac26a08ae1d374920020d (patch) | |
| tree | d8df432f99e856c41061c8836773ae3d342367cd /.gitlab/merge_request_templates | |
| parent | c70a70ea42e3f8742623e690dcd74d17c7c3b0ed (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/merge_request_templates')
| -rw-r--r-- | .gitlab/merge_request_templates/Documentation.md | 1 | ||||
| -rw-r--r-- | .gitlab/merge_request_templates/Security Release.md | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab/merge_request_templates/Documentation.md b/.gitlab/merge_request_templates/Documentation.md index e97ae9a0c43..63b50db08ea 100644 --- a/.gitlab/merge_request_templates/Documentation.md +++ b/.gitlab/merge_request_templates/Documentation.md @@ -18,6 +18,7 @@ ## Author's checklist +- Consider taking [the GitLab Technical Writing Fundamentals course](https://gitlab.edcast.com/pathways/ECL-02528ee2-c334-4e16-abf3-e9d8b8260de4) - [ ] Follow the: - [Documentation Guidelines](https://docs.gitlab.com/ee/development/documentation/). - [Style Guide](https://docs.gitlab.com/ee/development/documentation/styleguide/). diff --git a/.gitlab/merge_request_templates/Security Release.md b/.gitlab/merge_request_templates/Security Release.md index 33c0a5b98a8..7684546b91c 100644 --- a/.gitlab/merge_request_templates/Security Release.md +++ b/.gitlab/merge_request_templates/Security Release.md @@ -14,7 +14,6 @@ See [the general developer security release guidelines](https://gitlab.com/gitla - [ ] **On "Related issues" section, write down the [GitLab Security] issue it belongs to (i.e. `Related to <issue_id>`).** - [ ] Merge request targets `master`, or a versioned stable branch (`X-Y-stable-ee`). -- [ ] Milestone is set for the version this merge request applies to. A closed milestone can be assigned via [quick actions]. - [ ] Title of this merge request is the same as for all backports. - [ ] A [CHANGELOG entry] has been included, with `Changelog` trailer set to `security`. - [ ] For the MR targeting `master`: @@ -24,6 +23,7 @@ See [the general developer security release guidelines](https://gitlab.com/gitla - Please see the security release [Code reviews and Approvals](https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/developer.md#code-reviews-and-approvals) documentation for details on which AppSec team member to ping for approval. - Trigger the [`package-and-qa` build]. The docker image generated will be used by the AppSec engineer to validate the security vulnerability has been remediated. - [ ] For a backport MR targeting a versioned stable branch (`X-Y-stable-ee`) + - [ ] Milestone is set to the version this backport applies to. A closed milestone can be assigned via [quick actions]. - [ ] Ensure it's approved by a maintainer. **Note:** Reviewer/maintainer should not be a Release Manager |