diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-10-23 19:44:48 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-10-23 19:44:48 +0300 |
| commit | 3e18ac0e9ac04b4efce4c55748b8db12c5e42c3e (patch) | |
| tree | 4cf7676e6f322093d832294597796a0817a306a4 | |
| parent | ba3e650006180634909cb7550383fa9ca94b73b4 (diff) | |
| parent | 1e19363183fb1c830168b1f39d5e91bb7ff07b08 (diff) | |
Merge branch 'fix/security-workflow-dev' into 'master'
Update dev security workflow template
See merge request gitlab-org/gitlab-ce!22532
| -rw-r--r-- | .gitlab/issue_templates/Security developer workflow.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/issue_templates/Security developer workflow.md b/.gitlab/issue_templates/Security developer workflow.md index 64b54b171f7..69cf7fe1548 100644 --- a/.gitlab/issue_templates/Security developer workflow.md +++ b/.gitlab/issue_templates/Security developer workflow.md @@ -16,7 +16,6 @@ Set the title to: `[Security] Description of the original issue` - [ ] Add a link to the MR to the [links section](#links) - [ ] Add a link to an EE MR if required - [ ] Make sure the MR remains in-progress and gets approved after the review cycle, **but never merged**. -- [ ] Assign the MR to a RM once is reviewed and ready to be merged. Check the [RM list] to see who to ping. #### Backports @@ -26,7 +25,8 @@ Set the title to: `[Security] Description of the original issue` - [ ] 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) - [ ] Create each MR targetting the security branch `security-X-Y` - [ ] Add the ~security label and prefix with the version `WIP: [X.Y]` the title of the MR -- [ ] Make sure all MRs have a link in the [links section](#links) and are assigned to a Release Manager. +- [ ] Add the ~"Merge into Security" label to all of the MRs. +- [ ] Make sure all MRs have a link in the [links section](#links) [secpick documentation]: https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/developer.md#secpick-script |