diff options
| author | Alessio Caiazza <acaiazza@gitlab.com> | 2020-07-02 10:42:04 +0300 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2020-07-02 10:42:04 +0300 |
| commit | 16a5f6937c067c541eb0ecc8b6a6879ea6c0cb60 (patch) | |
| tree | ca9d2d74a1085bc6672aaa6bd00b07e9dd9f13af | |
| parent | a3e85408e71ec2eb69e658e7484b60ca592c8442 (diff) | |
| parent | ece15e062f814f783de0294ea6e2a4083d55f256 (diff) | |
Merge branch 'add-note-to-security-release-process' into 'master'
Adds a note for security MR created on GitLab Pages
See merge request gitlab-org/gitlab-pages!289
| -rw-r--r-- | .gitlab/merge_request_templates/Security Release.md | 2 | ||||
| -rw-r--r-- | PROCESS.md | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab/merge_request_templates/Security Release.md b/.gitlab/merge_request_templates/Security Release.md index 983ffbfc..df832c7d 100644 --- a/.gitlab/merge_request_templates/Security Release.md +++ b/.gitlab/merge_request_templates/Security Release.md @@ -15,7 +15,7 @@ When submitting a merge request for gitlab-pages, CE and EE merge requests for u ## Developer checklist -- [ ] Link to the developer security workflow issue on https://gitlab.com/gitlab-org/security/gitlab +- [ ] Link to the original confidential issue on https://gitlab.com/gitlab-org/gitlab-pages. **Warning don't associate this MR with the security implementation issue on GitLab Security** - [ ] MR targets `master`, or `X-Y-stable` for backports - [ ] Milestone is set for the version this MR applies to - [ ] Title of this MR is the same as for all backports @@ -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. |