diff options
Diffstat (limited to '.gitlab/issue_templates/Security developer workflow.md')
| -rw-r--r-- | .gitlab/issue_templates/Security developer workflow.md | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/.gitlab/issue_templates/Security developer workflow.md b/.gitlab/issue_templates/Security developer workflow.md index 7de137bd2e2..d21da6a161b 100644 --- a/.gitlab/issue_templates/Security developer workflow.md +++ b/.gitlab/issue_templates/Security developer workflow.md @@ -28,8 +28,8 @@ After your merge request has been approved according to our [approval guidelines * You can use the script `bin/secpick` instead of the following steps, to help you cherry-picking. See the [secpick documentation] - [ ] Create each MR targeting the stable branch `X-Y-stable`, using the [Security Release merge request template]. * Every merge request will have its own set of TODOs, so make sure to complete those. -- [ ] On the "Related merge requests" section, ensure all MRs are linked to this issue. - * This section should only list the merge requests created for this issue: One targeting `master` and the 3 backports. +- [ ] On the "Related merge requests" section, ensure that `4` merge requests are associated: The one targeting `master` and the `3` backports. +- [ ] If this issue requires less than `4` merge requests, post a message on the Security Release Tracking Issue and ping the Release Managers. ## Documentation and final details @@ -53,7 +53,7 @@ After your merge request has been approved according to our [approval guidelines | Description | Details | Further details| | -------- | -------- | -------- | | Versions affected | X.Y | | -| GitLab EE only | Yes/No | | +| GitLab EE only | Yes/No | | | Upgrade notes | | | | GitLab Settings updated | Yes/No| | | Migration required | Yes/No | | @@ -62,7 +62,6 @@ After your merge request has been approved according to our [approval guidelines [security process for developers]: https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/developer.md [secpick documentation]: https://gitlab.com/gitlab-org/release/docs/-/blob/master/general/security/utilities/secpick_script.md [security Release merge request template]: https://gitlab.com/gitlab-org/security/gitlab/blob/master/.gitlab/merge_request_templates/Security%20Release.md -[code review process]: https://docs.gitlab.com/ee/development/code_review.html [approval guidelines]: https://docs.gitlab.com/ee/development/code_review.html#approval-guidelines [issue as related]: https://docs.gitlab.com/ee/user/project/issues/related_issues.html#adding-a-related-issue |