diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 15:08:56 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-26 15:08:56 +0000 |
| commit | 17ab40ca089e1aef61a83f77ab6df62a72f6ce06 (patch) | |
| tree | 8eb149293eee90ec2750b6ac5e46a111a806424e /.gitlab | |
| parent | 66d4203791a01fdedf668a78818a229ea2c07aad (diff) | |
| download | gitlab-ce-17ab40ca089e1aef61a83f77ab6df62a72f6ce06.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/issue_templates/Security developer workflow.md | 4 | ||||
| -rw-r--r-- | .gitlab/merge_request_templates/Security Release.md | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/.gitlab/issue_templates/Security developer workflow.md b/.gitlab/issue_templates/Security developer workflow.md index 039157bf845..56be0453b33 100644 --- a/.gitlab/issue_templates/Security developer workflow.md +++ b/.gitlab/issue_templates/Security developer workflow.md @@ -50,10 +50,6 @@ After your merge request has being approved according to our [approval guideline | -------- | -------- | | Issue on [GitLab](https://gitlab.com/gitlab-org/gitlab/issues) | #TODO | | Security Release tracking issue | #TODO | -| `master` MR | !TODO | -| `Backport X.Y` MR | !TODO | -| `Backport X.Y` MR | !TODO | -| `Backport X.Y` MR | !TODO | ### Details diff --git a/.gitlab/merge_request_templates/Security Release.md b/.gitlab/merge_request_templates/Security Release.md index cccfafe397e..02cb4c59fd1 100644 --- a/.gitlab/merge_request_templates/Security Release.md +++ b/.gitlab/merge_request_templates/Security Release.md @@ -8,11 +8,11 @@ See [the general developer security release guidelines](https://gitlab.com/gitla ## Related issues -<!-- Mention the issue(s) this MR is related to --> +<!-- Mention the GitLab Security issue this MR is related to --> ## Developer checklist -- [ ] Link this MR in the `links` section of the related issue on [GitLab Security]. +- [ ] **Make sure this merge request mentions the [GitLab Security] issue it belongs to (i.e. `Related to <issue_id>`).** - [ ] Merge request targets `master`, or `X-Y-stable` for backports. - [ ] Milestone is set for the version this merge request applies to. A closed milestone can be assigned via [quick actions]. - [ ] Title of this merge request is the same as for all backports. |