summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-01-11 08:32:58 +0000
committerNick Thomas <nick@gitlab.com>2019-01-11 21:27:41 +0000
commit5f05ed7fc01a29c83810ead7d86f28e44cabb3aa (patch)
tree047e76e028c5ac16c3161e00951fabeeb3956351 /.gitlab
parent6ac5c2d32d2358f8135e922df6b70cb77bb03ef9 (diff)
downloadgitlab-ce-5f05ed7fc01a29c83810ead7d86f28e44cabb3aa.tar.gz
Create an MR for RCs when preparing security MRs
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/issue_templates/Security developer workflow.md2
1 files changed, 1 insertions, 1 deletions
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)