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 @@ ## 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).