root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@15-9-stable-ee

This commit is contained in:
GitLab Bot 2023-03-10 23:40:33 +00:00
parent d244360d8b
commit db87b632cb
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab/merge_request_templates/Stable Branch.md
View File

@ -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?

2
scripts/create-pipeline-failure-incident.rb
View File

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