From 5f05ed7fc01a29c83810ead7d86f28e44cabb3aa Mon Sep 17 00:00:00 2001 From: Nick Thomas Date: Fri, 11 Jan 2019 08:32:58 +0000 Subject: Create an MR for RCs when preparing security MRs --- .gitlab/issue_templates/Security developer workflow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitlab') diff --git a/.gitlab/issue_templates/Security developer workflow.md b/.gitlab/issue_templates/Security developer workflow.md index 08651195d98..f9bf700f809 100644 --- a/.gitlab/issue_templates/Security developer workflow.md +++ b/.gitlab/issue_templates/Security developer workflow.md @@ -20,7 +20,7 @@ Set the title to: `[Security] Description of the original issue` #### Backports -- [ ] Once the MR is ready to be merged, create MRs targetting the last 3 releases +- [ ] Once the MR is ready to be merged, create MRs targetting the last 3 releases, plus the current RC if between the 7th and 22nd of the month. - [ ] At this point, it might be easy to squash the commits from the MR into one - You can use the script `bin/secpick` instead of the following steps, to help you cherry-picking. See the [secpick documentation] - [ ] Create the branch `security-X-Y` from `X-Y-stable` if it doesn't exist (and make sure it's up to date with stable) -- cgit v1.2.3