morgan pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits: 4dd16b8c by Morgan at 2024-11-14T02:21:36+00:00 Bug 43295: Update MR templates

- - - - -

2 changed files:

- .gitlab/merge_request_templates/default.md - .gitlab/merge_request_templates/relprep.md

Changes:

===================================== .gitlab/merge_request_templates/default.md ===================================== @@ -2,18 +2,34 @@

<!-- Bookkeeping information for release management -->

-### Related Issues +### Issues + +#### Resolves +- tor-browser-build#xxxxx - tor-browser#xxxxx - mullvad-browser#xxxxx + +#### Related - tor-browser-build#xxxxx +- tor-browser#xxxxx +- mullvad-browser#xxxxx + +### Merging + +<!-- This block tells the merger where commits need to be merged and future code archaeologists where commits were *supposed* to be merged --> + +#### Target Branches + - [ ] **`main`**: esr128-14.5 + - [ ] **`maint-14.0`**: esr128-14.0 + - [ ] **`maint-13.5`**: esr115-13.5

### Backporting

#### Timeline +- [ ] **No Backport (preferred)**: patchset for the next major stable - [ ] **Immediate**: patchset needed as soon as possible - [ ] **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 -- [ ] **No Backport (preferred)**: patchset for the next major stable

#### (Optional) Justification - [ ] **Emergency security update**: patchset fixes CVEs, 0-days, etc @@ -50,7 +66,7 @@ - **windows** : jwilde, morgan - **misc/other** : morgan, pierov

-### Change Description +#### Change Description

<!-- Whatever context the reviewer needs to effectively review the patchset; if the patch includes UX updates be sure to include screenshots/video of how any new behaviour -->

===================================== .gitlab/merge_request_templates/relprep.md ===================================== @@ -1,9 +1,19 @@ -## Related Issues +## Release Prep

+### Issues + +#### Resolves + +- tor-browser-build#xxxxx - tor-browser-build#xxxxx + +#### Related + - tor-browser-build#xxxxx +- tor-browser#xxxxx +- mullvad-browser#xxxxx

-## Self-review + reviewer's template +### Self-review + reviewer's template

- [ ] `rbm.conf` updates: - [ ] `var/torbrowser_version` @@ -15,12 +25,12 @@ - [ ] Tag updates: - [ ] [Firefox](https://gitlab.torproject.org/tpo/applications/tor-browser/-/tags) - [ ] Geckoview - should match Firefox - - Tags might be speculative in the release preparation: i.e., they might not exist yet. + - **NOTE**: Tags might be speculative in the release preparation: i.e., they might not exist yet. - [ ] Addon updates: - [ ] [NoScript](https://addons.mozilla.org/en-US/firefox/addon/noscript/) - [ ] [uBlock Origin](https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/) (Mullvad Browser only) - [ ] [Mullvad Browser Extension](https://github.com/mullvad/browser-extension/releases) (Mullvad Browser only) - - For AMO extension (NoScript and uBlock), updating the version in the URL is not enough, check that also a numeric ID from the URL has changed + - ⚠️ **IMPORTANT**: For AMO extension (NoScript and uBlock), updating the version in the URL is not enough, check that also a numeric ID from the URL has changed - [ ] Tor and dependencies updates (Tor Browser only) - [ ] [Tor](https://gitlab.torproject.org/tpo/core/tor/-/tags) - [ ] [OpenSSL](https://www.openssl.org/source/): we stay on the latest LTS channel (currently 3.0.x) @@ -39,11 +49,11 @@ - If you find errors such as platform or category (build system) please adjust the issue label accordingly - You can run `tools/relprep.py --only-changelogs --date $date $version` to update only the changelogs

-## Review +### Review

-### Request Reviewer +#### Request Reviewer

- [ ] Request review from a release engineer: boklm, dan, ma1, morgan, pierov

-### Change Description +#### Change Description

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4d...