diff options
author | Mayra Cabrera <mcabrera@gitlab.com> | 2020-05-25 17:54:53 +0300 |
---|---|---|
committer | Mayra Cabrera <mcabrera@gitlab.com> | 2020-06-10 17:23:53 +0300 |
commit | ece15e062f814f783de0294ea6e2a4083d55f256 (patch) | |
tree | 90b6bccb25023564b6dae4d2dad4177f38e76946 /PROCESS.md | |
parent | 193b911922d389ab2a8145d1fda190faecc13704 (diff) |
Adds a note for security MR created on GitLab Pages
Security merge requests created on GitLab Pages are merged manually by
maintainers at different times during the Security Release. Therefore
they should not be associated to the Security Issue, given our tooling
only considers issues whose merge requests are all assigned to the bot
Related to https://gitlab.com/gitlab-com/gl-infra/delivery/-/issues/681
Diffstat (limited to 'PROCESS.md')
-rw-r--r-- | PROCESS.md | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -55,9 +55,10 @@ Pages security releases are built on top of the [GitLab Security Release process the same steps stated on the [Security Developer] guidelines with some adjustments: - Apart from the [security merge requests] created on [GitLab Security], merge requests will also be created on [GitLab Pages Security]: - - Security merge requests are required to use the [merge request security template]. - Merge request targeting `master` is prepared with the GitLab Pages security fix. - Backports are prepared for the last releases corresponding to last 3 GitLab releases. + - Security merge requests are required to use the [merge request security template]. + - **It's important for these merge requests to not be associated with the Security Implementation Issue created on [GitLab Security], otherwise the security issue won't be considered by [Release Tools].** - Security merge requests created on [GitLab Security] will bump the `GITLAB_PAGES_VERSION`. - Once the merge requests on [GitLab Pages Security] are approved: - Maintainers of GitLab Pages will merge the security merge requests **targeting stable branches** and create a new tag for these branches. |