diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-15 21:08:48 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-15 21:08:48 +0000 |
commit | 600ca978129e3ccab758f57d60786cefe66ad775 (patch) | |
tree | a3675da98c7c245adf7e93f82f9c26a38cc3c29d /.gitlab/merge_request_templates | |
parent | 571d993b49313dd806bd3f6af16d36c26d9d28ca (diff) | |
download | gitlab-ce-600ca978129e3ccab758f57d60786cefe66ad775.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/merge_request_templates')
-rw-r--r-- | .gitlab/merge_request_templates/Security Release.md | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab/merge_request_templates/Security Release.md b/.gitlab/merge_request_templates/Security Release.md index 30eb2afaa4d..cccfafe397e 100644 --- a/.gitlab/merge_request_templates/Security Release.md +++ b/.gitlab/merge_request_templates/Security Release.md @@ -18,13 +18,14 @@ See [the general developer security release guidelines](https://gitlab.com/gitla - [ ] Title of this merge request is the same as for all backports. - [ ] A [CHANGELOG entry](https://docs.gitlab.com/ee/development/changelog.html) is added without a `merge_request` value, with `type` set to `security` - [ ] Assign to a reviewer and maintainer, per our [Code Review process]. -- [ ] If this merge request targets `master`, ensure it's approved according to our [Approval Guidelines]. +- [ ] For the MR targeting `master`: + - [ ] Ping appsec team member who created the issue and ask for a non-blocking review with `Please review this MR`. + - [ ] Ensure it's approved according to our [Approval Guidelines]. - [ ] Merge request _must not_ close the corresponding security issue, _unless_ it targets `master`. **Note:** Reviewer/maintainer should not be a Release Manager -## Reviewer checklist - +## Maintainer checklist - [ ] Correct milestone is applied and the title is matching across all backports - [ ] Assigned to `@gitlab-release-tools-bot` with passing CI pipelines |