Commit 0d538394 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by morgan
Browse files

fixup! Adding issue and merge request templates 

Remove "Emergency" from security updates as per today's meeting.

Our policy usually is to backport (almost) all emergency fixes, sooner
or later. The actual emergency can be inferred from the timeline.
parent fe2fa243

.gitlab/merge_request_templates/default.md

+2 −2
Original line number Diff line number Diff line
@@ -34,12 +34,12 @@ 


#### Timeline

- [ ] **No Backport (preferred)**: patchset for the next major stable

- [ ] **Immediate**: patchset needed as soon as possible

- [ ] **Immediate**: patchset needed as soon as possible (fixes CVEs, 0-days, etc)

- [ ] **Next Minor Stable Release**: patchset that needs to be verified in nightly before backport

- [ ] **Eventually**: patchset that needs to be verified in alpha before backport



#### (Optional) Justification

- [ ] **Emergency security update**: patchset fixes CVEs, 0-days, etc

- [ ] **Security update**: patchset contains a security fix (be sure to select the correct item in _Timeline_)

- [ ] **Critical bug-fix**: patchset fixes a bug in core-functionality

- [ ] **Consistency**: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc

- [ ] **Sponsor required**: patchset required for sponsor