Merge branch 'update-security-release-template' into 'master'

Update security release template for the new setup

See merge request gitlab-org/gitlab!25901

.gitlab/issue_templates/Security Release.md

@@ -12,23 +12,24 @@ Set the title to: `Security Release: 12.2.X, 12.1.X, and 12.0.X`
 
 ## Version issues:
 
-* 12.2.X: {release task link}
-* 12.1.X: {release task link}
-* 12.0.X: {release task link}
+12.2.X, 12.1.X, 12.0.X: {release task link}
 
 ## Issues in GitLab Security
 
-* {https://gitlab.com/gitlab-org/security/gitlab/issues/ link}
+To include your issue and merge requests in this Security Release, please mark
+your security issues as related to this release tracking issue. You can do this
+in the "Linked issues" section below this issue description.
 
-| Version | MR |
-|---------|----|
-| 12.2 | {https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests link} |
-| 12.1 | {https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests link} |
-| 12.0 | {https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests link} |
-| master | {https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests link} |
+:warning: If your security issues are not marked as related to this release
+tracking issue, their merge requests may not be included in the security
+release.
 
 ## Issues in Omnibus-GitLab
 
+Omnibus security fixes need to be added manually to this issue description
+using and below the following template:
+
+```markdown
 * {https://gitlab.com/gitlab-org/security/gitlab/issues/ link}
 
 | Version | MR |
@@ -37,6 +38,7 @@ Set the title to: `Security Release: 12.2.X, 12.1.X, and 12.0.X`
 | 12.1 | {https://dev.gitlab.org/gitlab/omnibus-gitlab/merge_requests/ link} |
 | 12.0 | {https://dev.gitlab.org/gitlab/omnibus-gitlab/merge_requests/ link} |
 | master | {https://dev.gitlab.org/gitlab/omnibus-gitlab/merge_requests/ link} |
+```
 
 ## QA
 {QA issue link}
@@ -49,5 +51,5 @@ GitLab.com: {https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/ link}
 ## Email notification
 {https://gitlab.com/gitlab-com/marketing/general/issues/ link}
 
-/label ~security
+/label ~security ~"upcoming security release"
 /confidential