diff options
author | Alessio Caiazza <acaiazza@gitlab.com> | 2020-05-15 14:18:59 +0300 |
---|---|---|
committer | Alessio Caiazza <acaiazza@gitlab.com> | 2020-05-15 14:18:59 +0300 |
commit | 7fc40304d81069da9f9dc1f201714ae7a848f708 (patch) | |
tree | d946303f498d89de89cc2d0f1c86c3d4cf987fdb | |
parent | 151ecc2704b7467488fab0a9b2c2410f75d438ff (diff) | |
parent | 85124bcdce94e5600b1541e5948a5ef2c1bcbcdd (diff) |
Merge branch 'revert-34cfb385' into 'master'
Move security fixes from dev to security mirror
See merge request gitlab-org/gitlab-pages!283
-rw-r--r-- | .gitlab/merge_request_templates/Security Release.md | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/.gitlab/merge_request_templates/Security Release.md b/.gitlab/merge_request_templates/Security Release.md index bb4265bb..983ffbfc 100644 --- a/.gitlab/merge_request_templates/Security Release.md +++ b/.gitlab/merge_request_templates/Security Release.md @@ -1,6 +1,6 @@ <!-- # README first! -This MR should be created on `dev.gitlab.org`. +This MR should be created on `https://gitlab.com/gitlab-org/security/gitlab-pages`. See [the general developer security release guidelines](https://gitlab.com/gitlab-org/release/docs/blob/master/general/security/developer.md). @@ -15,20 +15,19 @@ 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 `dev.gitlab.org` +- [ ] Link to the developer security workflow issue on https://gitlab.com/gitlab-org/security/gitlab - [ ] 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 - [ ] A CHANGELOG entry is added - [ ] Add a link to this MR in the `links` section of related issue -- [ ] Set up an CE MR: CE_MR_LINK_HERE -- [ ] Set up an EE MR: EE_MR_LINK_HERE +- [ ] Create a merge request in [GitLab Security](https://gitlab.com/gitlab-org/security/gitlab) bumping GitLab pages version: MR_LINK_HERE - [ ] Assign to a Pages maintainer for review and merge ## Reviewer checklist - [ ] Correct milestone is applied and the title is matching across all backports - [ ] Merge this merge request -- [ ] Create corresponding tag and push it to `dev.gitlab.org` +- [ ] Create corresponding tag and push it to https://gitlab.com/gitlab-org/security/gitlab-pages /label ~security |