Skip to content

Commit 4a95409

Browse files
Robert MarshallSteve Abrams
andcommitted
Merge branch 'delivery19680-security-target' into 'master'
Update template for security-target label See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7178 Merged-by: Robert Marshall <[email protected]> Approved-by: Robert Marshall <[email protected]> Co-authored-by: Steve Abrams <[email protected]>
2 parents 7c96cf6 + 71fcfdc commit 4a95409

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

.gitlab/issue_templates/Security developer workflow.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ Set the title to: `Description of the original issue`
99
### Prior to starting the security release work
1010

1111
- [ ] Read the [security process for developers] if you are not familiar with it.
12-
- [ ] Mark this [issue as related] to the Security Release tracking issue. You can find it on the topic of the `#releases` Slack channel.
1312
- Fill out the [Links section](#links):
1413
- [ ] Next to **Issue on Omnibus GitLab**, add a link to the `gitlab-org/omnibus-gitlab` issue that describes the security vulnerability.
15-
- [ ] Next to **Security Release tracking issue**, add a link to the security release issue that will include this security issue.
1614

1715
### Development
1816

@@ -27,12 +25,19 @@ After your merge request has been approved according to our approval guidelines,
2725

2826
- [ ] Once the MR is ready to be merged, create MRs targeting the latest 3 stable branches
2927
* At this point, it might be easy to squash the commits from the MR into one
28+
* 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.
3029
- [ ] Create each MR targeting the stable branch `X-Y-stable`, using the [Security Release merge request template].
3130
* Every merge request will have its own set of TODOs, so make sure to complete those.
3231
- [ ] On the "Related merge requests" section, ensure all MRs are linked to this issue.
3332
* This section should only list the merge requests created for this issue: One targeting `master` and the 3 backports.
3433
- [ ] If this issue requires less than 4 merge requests, post a message on the Security Release Tracking Issue and ping the Release Managers.
3534

35+
#### Assigning to a release
36+
37+
- [ ] When this issue is ready for release (all needed backports are approved and ready to be merged), apply the ~"security-target" label for it to be evaluated and linked to the next planned security release tracking issue.
38+
* The `gitlab-release-tools-bot` evaluates and links issues with the label to the next planned security release tracking issue. If the bot finds the issue is not ready to be included in the security release, it will leave a comment on the issue explaining what needs to be done.
39+
* This issue will only be included in a security release if it is successfully linked to the security release tracking issue.
40+
3641
#### Documentation and final details
3742

3843
- [ ] Ensure the [Links section](#links) is completed.
@@ -48,7 +53,6 @@ After your merge request has been approved according to our approval guidelines,
4853
| Description | Link |
4954
| -------- | -------- |
5055
| Issue on [Omnibus GitLab](https://gitlab.com/gitlab-org/omnibus-gitlab/issues) | #TODO |
51-
| Security Release tracking issue | #TODO |
5256

5357
#### Details
5458

@@ -65,4 +69,4 @@ After your merge request has been approved according to our approval guidelines,
6569
[issue as related]: https://docs.gitlab.com/ee/user/project/issues/related_issues.html#adding-a-related-issue
6670
[security Release merge request template]: https://gitlab.com/gitlab-org/omnibus-gitlab/-/blob/master/.gitlab/merge_request_templates/Security%20Release.md
6771

68-
/label ~security
72+
/labels ~security ~"security-notifications"

0 commit comments

Comments
 (0)