summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2018-11-29 19:42:29 +0000
committerRobert Speicher <rspeicher@gmail.com>2018-11-29 19:42:29 +0000
commit5125ec5f50c35ae30559ab4ff967e6d7c76c5c2f (patch)
treee62a008d83fd567bf730a537873635efe90464ba
parenta6664ad61d760fb1b70f2ee73effb05f1a9dcd38 (diff)
parent099cf276a97e4e677241807820999092cd54561e (diff)
downloadgitlab-ce-5125ec5f50c35ae30559ab4ff967e6d7c76c5c2f.tar.gz
Merge branch 'docs-security-workflow-keep-original-updated' into 'master'
Update Security developer workflow template See merge request gitlab-org/gitlab-ce!23458
-rw-r--r--.gitlab/issue_templates/Security developer workflow.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab/issue_templates/Security developer workflow.md b/.gitlab/issue_templates/Security developer workflow.md
index 69cf7fe1548..08651195d98 100644
--- a/.gitlab/issue_templates/Security developer workflow.md
+++ b/.gitlab/issue_templates/Security developer workflow.md
@@ -16,6 +16,7 @@ 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**.
+- [ ] Add a link to this issue on the original security issue.
#### Backports
@@ -37,6 +38,7 @@ Set the title to: `[Security] Description of the original issue`
- [ ] Fill in any upgrade notes that users may need to take into account in the [details section](#details)
- [ ] Add Yes/No and further details if needed to the migration and settings columns in the [details section](#details)
- [ ] Add the nickname of the external user who found the issue (and/or HackerOne profile) to the Thanks row in the [details section](#details)
+- [ ] Once your `master` MR is merged, comment on the original security issue with a link to that MR indicating the issue is fixed.
### Summary