summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-03-10 23:40:33 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-03-10 23:40:33 +0000
commitdb87b632cbadc272dee1acbb10d226680f7212a2 (patch)
tree57c6d27074b778e28f382f51ce7826dab3227bcf /.gitlab
parentd244360d8b38218bd3e71c0203e9f2af41498daa (diff)
downloadgitlab-ce-db87b632cbadc272dee1acbb10d226680f7212a2.tar.gz
Add latest changes from gitlab-org/gitlab@15-9-stable-ee
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/merge_request_templates/Stable Branch.md8
1 files changed, 6 insertions, 2 deletions
diff --git a/.gitlab/merge_request_templates/Stable Branch.md b/.gitlab/merge_request_templates/Stable Branch.md
index e584296cbb1..9f1408e06bc 100644
--- a/.gitlab/merge_request_templates/Stable Branch.md
+++ b/.gitlab/merge_request_templates/Stable Branch.md
@@ -1,6 +1,10 @@
<!--
-Merging into stable branches is reserved for GitLab patch releases
-https://docs.gitlab.com/ee/policy/maintenance.html#patch-releases
+Merging into stable branches in canonical projects is reserved for
+GitLab patch releases https://docs.gitlab.com/ee/policy/maintenance.html#patch-releases
+
+If you're backporting a security fix, please refer to the security merge request
+template https://gitlab.com/gitlab-org/security/gitlab/blob/master/.gitlab/merge_request_templates/Security%20Release.md.
+Security backport merge requests should not be opened on this project.
-->
## What does this MR do and why?