From db87b632cbadc272dee1acbb10d226680f7212a2 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 10 Mar 2023 23:40:33 +0000
Subject: Add latest changes from gitlab-org/gitlab@15-9-stable-ee

---
 .gitlab/merge_request_templates/Stable Branch.md | 8 ++++++--
 scripts/create-pipeline-failure-incident.rb      | 2 --
 2 files changed, 6 insertions(+), 4 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?
diff --git a/scripts/create-pipeline-failure-incident.rb b/scripts/create-pipeline-failure-incident.rb
index 2b86fac680d..bd57abf3740 100755
--- a/scripts/create-pipeline-failure-incident.rb
+++ b/scripts/create-pipeline-failure-incident.rb
@@ -170,8 +170,6 @@ class CreatePipelineFailureIncident
       Additionally, a message can be posted in `#backend_maintainers` or `#frontend_maintainers` to get a maintainer take a look at the fix ASAP.
     - Cherry picking a change that was used to fix a similar master-broken issue.
 
-    In both cases, make sure to add the ~"pipeline:expedite" label to speed up the `stable`-fixing pipelines.
-
     ### Resolution
 
     Add a comment to this issue describing how this incident could have been prevented earlier in the Merge Request pipeline (rather than the merge commit pipeline).
-- 
cgit v1.2.1