Skip to content

Commit 3ff2e66

Browse files
balasankarcSteve Abrams
andcommitted
Merge branch 'update-sec-template' into 'master'
Add link to security workflow template See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7257 Merged-by: Balasankar 'Balu' C <[email protected]> Approved-by: João Alexandre Cunha <[email protected]> Co-authored-by: Steve Abrams <[email protected]>
2 parents a034d14 + abd0753 commit 3ff2e66

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

.gitlab/issue_templates/Security developer workflow.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@ After your merge request has been approved according to our approval guidelines,
2424
#### Backports
2525

2626
- [ ] Once the MR is ready to be merged, create MRs targeting the latest 3 stable branches
27+
* The 3 stable branches correspond to the versions in the title of the [Security Release Tracking Issue].
2728
* At this point, it might be easy to squash the commits from the MR into one
2829
* Depending on when development is happening, you may need to wait for the last stable branch to be created. If the ~"security-notifications" label is applied to this issue, you will receive a ping when the branch is created.
2930
- [ ] Create each MR targeting the stable branch `X-Y-stable`, using the [Security Release merge request template].
3031
* Every merge request will have its own set of TODOs, so make sure to complete those.
3132
- [ ] On the "Related merge requests" section, ensure all MRs are linked to this issue.
3233
* This section should only list the merge requests created for this issue: One targeting `master` and the 3 backports.
33-
- [ ] If this issue requires less than 4 merge requests, post a message on the Security Release Tracking Issue and ping the Release Managers.
34+
- [ ] If this issue requires less than `4` merge requests, add the ~"reduced backports" label.
3435

3536
#### Assigning to a release
3637

@@ -68,5 +69,6 @@ After your merge request has been approved according to our approval guidelines,
6869
[RM list]: https://about.gitlab.com/release-managers/
6970
[issue as related]: https://docs.gitlab.com/ee/user/project/issues/related_issues.html#adding-a-related-issue
7071
[security Release merge request template]: https://gitlab.com/gitlab-org/omnibus-gitlab/-/blob/master/.gitlab/merge_request_templates/Security%20Release.md
72+
[Security Release Tracking Issue]: https://gitlab.com/gitlab-org/gitlab/-/issues/?label_name%5B%5D=upcoming%20security%20release
7173

7274
/labels ~security ~"security-notifications"

0 commit comments

Comments
 (0)