diff options
| author | Toon Claes <toon@gitlab.com> | 2021-05-25 10:27:02 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2021-05-25 10:27:02 +0300 |
| commit | ac182795482e6914380bd5009055a57266047e21 (patch) | |
| tree | 45df5211b70b33841402ff114e9e56b067139cba | |
| parent | 41474cfce260e81913084e6d169c43e864094838 (diff) | |
| parent | bdd38aa9fd36fa07af44bc96bf2800ccba4ce190 (diff) | |
Merge branch 'update-security-mr-template' into 'master'
Update security merge request template
See merge request gitlab-org/gitaly!3535
| -rw-r--r-- | .gitlab/merge_request_templates/Security Release.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/merge_request_templates/Security Release.md b/.gitlab/merge_request_templates/Security Release.md index cbaf81277..e08504660 100644 --- a/.gitlab/merge_request_templates/Security Release.md +++ b/.gitlab/merge_request_templates/Security Release.md @@ -16,7 +16,7 @@ See [the general developer security release guidelines](https://gitlab.com/gitla - [ ] Merge request targets `master`, or `X-Y-stable` for backports. - [ ] 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](https://docs.gitlab.com/ee/development/changelog.html) is added without a `merge_request` value, with `type` set to `security` +- [ ] A [CHANGELOG entry] has been included, with `Changelog` trailer set to `security`. - [ ] Assign to a reviewer and maintainer, per our [Code Review process]. - [ ] For the MR targeting `master`: - [ ] Ensure it's approved according to our [Approval Guidelines]. @@ -34,4 +34,4 @@ See [the general developer security release guidelines](https://gitlab.com/gitla [approval guidelines]: https://docs.gitlab.com/ee/development/code_review.html#approval-guidelines [Code Review process]: https://docs.gitlab.com/ee/development/code_review.html [quick actions]: https://docs.gitlab.com/ee/user/project/quick_actions.html#quick-actions-for-issues-merge-requests-and-epics - +[CHANGELOG entry]: https://docs.gitlab.com/ee/development/changelog.html#overview |