diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-01-12 01:14:24 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-01-12 01:14:24 +0300 |
| commit | 6d6c2e95dd8c813a9646c6289589957749bd4b0c (patch) | |
| tree | 0d5fdcd19ed8613d1a22c195a6445059fce3b6a4 | |
| parent | 962c8e511084514ce5115b37b0c4fb11e51da84a (diff) | |
| parent | 5f05ed7fc01a29c83810ead7d86f28e44cabb3aa (diff) | |
Merge branch 'sec-dev-workflow-rc' into 'master'
Create an MR for RCs when preparing security MRs
See merge request gitlab-org/gitlab-ce!24319
| -rw-r--r-- | .gitlab/issue_templates/Security developer workflow.md | 2 |
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) |