- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][base-browser-140.2.0esr-15.0-1] 2 commits: fixup! BB 43615: Add Gitlab Issue and Merge Request templates
by morgan (＠morgan) 14 Aug '25

14 Aug '25

morgan pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: c3f7c668 by Morgan at 2025-08-14T15:36:08+00:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates update branch creation section now that we have tags from the firefox repo - - - - - fcff0e12 by Morgan at 2025-08-14T15:36:15+00:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates Update priority labels - - - - - 4 changed files: - .gitlab/issue_templates/060 Rebase - Alpha.md - .gitlab/issue_templates/061 Rebase - Stable.md - .gitlab/issue_templates/063 Rebase - Rapid.md - .gitlab/issue_templates/090 Emergency Security Issue.md Changes: ===================================== .gitlab/issue_templates/060 Rebase - Alpha.md ===================================== @@ -45,17 +45,8 @@ ### **Create New Branches** -- [ ] Find the Firefox mercurial tag `$(ESR_TAG)` - - If `$(BROWSER_MINOR)` is 5, the tag should already exist from the stable release - - Otherwise: - - [ ] Go to `https://hg.mozilla.org/releases/mozilla-esr$(ESR_MAJOR)/tags` - - [ ] Find and inspect the commit tagged with `$(ESR_TAG)` - - Tags are in yellow in the Mercurial web UI - - [ ] Find the equivalent commit in `https://github.com/mozilla/gecko-dev/commits/esr$(ESR_MAJOR)` - - The tag should be very close to `HEAD` (usually the second, before a `No bug - Tagging $(HG_HASH) with $(ESR_TAG)`) - - **Notice**: GitHub sorts commits by time, you might want to use `git log gecko-dev/esr$(ESR_MAJOR)` locally, instead - - [ ] Sign/Tag the `gecko-dev` commit: `git tag -as $(ESR_TAG) $(GIT_HASH) -m "Hg tag $(ESR_TAG)"` -- [ ] Create new alpha `base-browser` branch from Firefox mercurial tag +- [ ] Fetch Mozilla's firefox repo and identify this release's ${ESR_TAG} +- [ ] Create new alpha `base-browser` branch from Firefox ${ESR_TAG} - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` - **Example**: `base-browser-102.8.0esr-12.5-1` - [ ] Create new alpha `tor-browser` branch from Firefox mercurial tag @@ -160,4 +151,4 @@ /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Rebase" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/061 Rebase - Stable.md ===================================== @@ -42,15 +42,7 @@ ### **Identify the Firefox Tagged Commit and Create New Branches** -- [ ] Find the Firefox mercurial tag here: https://hg.mozilla.org/releases/mozilla-esr102/tags - - **Example**: `FIREFOX_102_8_0esr_BUILD1` -- [ ] Find the analogous `gecko-dev` commit: https://github.com/mozilla/gecko-dev - - **Tip**: Search for unique string (like the Differential Revision ID) found in the mercurial commit in the `gecko-dev/esr102` branch to find the equivalent commit - - **Example**: `3a3a96c9eedd02296d6652dd50314fccbc5c4845` -- [ ] Sign and Tag `gecko-dev` commit - - Sign/Tag `gecko-dev` commit : - - **Tag**: `$(ESR_TAG)` - - **Message**: `Hg tag $(ESR_TAG)` +- [ ] Fetch Mozilla's firefox repo and identify this release's ${ESR_TAG} - [ ] Create new stable `base-browser` branch from tag - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` - **Example**: `base-browser-102.8.0esr-12.0-1` @@ -122,4 +114,4 @@ /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Rebase" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/063 Rebase - Rapid.md ===================================== @@ -138,15 +138,8 @@ gitGraph: ### **Create New Branches** -- [ ] Find the Firefox mercurial tag `$(NIGHTLY_TAG)` - - Go to https://hg.mozilla.org/mozilla-central/tags - - Find and inspect the commit tagged with `$(NIGHTLY_TAG)` - - Tags are in yellow in the Mercurial web UI - - Find the equivalent commit in https://github.com/mozilla/gecko-dev/commits/master - - **Notice**: GitHub sorts commits by time, you might want to use `git log gecko-dev/master` locally, instead - - Using the differential revision link is useful to quickly find the git commit - - Sign/Tag the `gecko-dev` commit: `git tag -as $(NIGHTLY_TAG) $(GIT_HASH) -m "Hg tag $(NIGHTLY_TAG)"` -- [ ] Create two new rapid `tor-browser` branches from Firefox mercurial tag +- [ ] Fetch Mozilla's firefox repo and identify this release's ${NIGHTLY_TAG} +- [ ] Create two new rapid `tor-browser` branches from Firefox ${NIGHTLY_TAG} - Branch name in the form: `tor-browser-$(NIGHTLY_VERSION)-$(BROWSER_VERSION)-${BRANCH_NUM}` - **Example**: `tor-browser-130.0a1-15.0-1` and `tor-browser-130.0a1-15.0-2` - [ ] Push new `tor-browser` branches and the `firefox` tag to `upstream` @@ -297,4 +290,4 @@ gitGraph: /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Rebase" -/label ~"Apps::Priority::High" +/label ~"Priority::High" ===================================== .gitlab/issue_templates/090 Emergency Security Issue.md ===================================== @@ -101,5 +101,5 @@ Godspeed! :pray: /label ~"Apps::Product::TorBrowser" /label ~"Apps::Product::MullvadBrowser" /label ~"Apps::Type::Bug" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" /label ~"Emergency" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/0f93b8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/0f93b8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] 6 commits: fixup! BB 43615: Add Gitlab Issue and Merge Request templates
by morgan (＠morgan) 14 Aug '25

14 Aug '25

morgan pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 3aa641b8 by Morgan at 2025-08-14T15:08:44+00:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates update branch creation section now that we have tags from the firefox repo - - - - - c5096579 by Morgan at 2025-08-14T15:08:45+00:00 fixup! TB 43616: Customize Gitlab Issue and Merge Request templates update the triage issue to be a general review issue; include release notes in review - - - - - 0b374a60 by Morgan at 2025-08-14T15:08:46+00:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates Update priority labels - - - - - ccf4f67e by Morgan at 2025-08-14T15:08:46+00:00 fixup! TB 43616: Customize Gitlab Issue and Merge Request templates Update priority labels - - - - - f69cb535 by Morgan at 2025-08-14T15:08:46+00:00 fixup! TB 43616: Customize Gitlab Issue and Merge Request templates add Tor Browser 16.0 milestone to the firefox review - - - - - 283e83c9 by Morgan at 2025-08-14T15:08:47+00:00 fixup! TB 43616: Customize Gitlab Issue and Merge Request templates - - - - - 11 changed files: - .gitlab/issue_templates/060 Rebase - Alpha.md - .gitlab/issue_templates/061 Rebase - Stable.md - .gitlab/issue_templates/062 Rebase - Legacy.md - .gitlab/issue_templates/063 Rebase - Rapid.md - .gitlab/issue_templates/080 Security Backports.md - .gitlab/issue_templates/090 Emergency Security Issue.md - .gitlab/issue_templates/100 Release QA - Desktop.md - .gitlab/issue_templates/101 Release QA - Android.md - .gitlab/issue_templates/110 Bugzilla Triage.md → .gitlab/issue_templates/110 Firefox Release Review.md - .gitlab/issue_templates/120 Bugzilla Audit.md - .gitlab/issue_templates/Default.md Changes: ===================================== .gitlab/issue_templates/060 Rebase - Alpha.md ===================================== @@ -36,8 +36,8 @@ - [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…: - [ ] Remove previous alpha `base-browser` and `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) - [ ] Create new `base-browser` and `tor-browser` branch protection rule: - - **Branch**: `*-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*` - - **Example**: `*-102.8.0esr-12.5-1*` + - **Branch**: `(tor|base)-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*` + - **Example**: `(tor|base)-browser-102.8.0esr-12.5-1*` - **Allowed to merge**: `Maintainers` - **Allowed to push and merge**: `Maintainers` - **Allowed to force push**: `false` @@ -45,17 +45,8 @@ ### **Create New Branches** -- [ ] Find the Firefox mercurial tag `$(ESR_TAG)` - - If `$(BROWSER_MINOR)` is 5, the tag should already exist from the stable release - - Otherwise: - - [ ] Go to `https://hg.mozilla.org/releases/mozilla-esr$(ESR_MAJOR)/tags` - - [ ] Find and inspect the commit tagged with `$(ESR_TAG)` - - Tags are in yellow in the Mercurial web UI - - [ ] Find the equivalent commit in `https://github.com/mozilla/gecko-dev/commits/esr$(ESR_MAJOR)` - - The tag should be very close to `HEAD` (usually the second, before a `No bug - Tagging $(HG_HASH) with $(ESR_TAG)`) - - **Notice**: GitHub sorts commits by time, you might want to use `git log gecko-dev/esr$(ESR_MAJOR)` locally, instead - - [ ] Sign/Tag the `gecko-dev` commit: `git tag -as $(ESR_TAG) $(GIT_HASH) -m "Hg tag $(ESR_TAG)"` -- [ ] Create new alpha `base-browser` branch from Firefox mercurial tag +- [ ] Fetch Mozilla's firefox repo and identify this release's ${ESR_TAG} +- [ ] Create new alpha `base-browser` branch from Firefox ${ESR_TAG} - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` - **Example**: `base-browser-102.8.0esr-12.5-1` - [ ] Create new alpha `tor-browser` branch from Firefox mercurial tag @@ -160,4 +151,4 @@ /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Rebase" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/061 Rebase - Stable.md ===================================== @@ -34,23 +34,15 @@ - [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…: - [ ] Remove previous stable `base-browser` and `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) - [ ] Create new `base-browser` and `tor-browser` branch protection rule: - - **Branch**: `*-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*` - - **Example**: `*-102.8.0esr-12.0-1*` + - **Branch**: `(tor|base)-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*` + - **Example**: `(tor|base)-browser-102.8.0esr-12.0-1*` - **Allowed to merge**: `Maintainers` - **Allowed to push and merge**: `Maintainers` - **Allowed to force push**: `false` ### **Identify the Firefox Tagged Commit and Create New Branches** -- [ ] Find the Firefox mercurial tag here: https://hg.mozilla.org/releases/mozilla-esr102/tags - - **Example**: `FIREFOX_102_8_0esr_BUILD1` -- [ ] Find the analogous `gecko-dev` commit: https://github.com/mozilla/gecko-dev - - **Tip**: Search for unique string (like the Differential Revision ID) found in the mercurial commit in the `gecko-dev/esr102` branch to find the equivalent commit - - **Example**: `3a3a96c9eedd02296d6652dd50314fccbc5c4845` -- [ ] Sign and Tag `gecko-dev` commit - - Sign/Tag `gecko-dev` commit : - - **Tag**: `$(ESR_TAG)` - - **Message**: `Hg tag $(ESR_TAG)` +- [ ] Fetch Mozilla's firefox repo and identify this release's ${ESR_TAG} - [ ] Create new stable `base-browser` branch from tag - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` - **Example**: `base-browser-102.8.0esr-12.0-1` @@ -122,4 +114,4 @@ /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Rebase" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/062 Rebase - Legacy.md ===================================== @@ -29,31 +29,19 @@ - [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…: - [ ] Remove previous legacy `base-browser` and `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) - - [ ] Create new `base-browser` and `tor-browser` branch protection rule: - - **Branch**: `*-$(ESR_VERSION)esr-13.5-1*` - - **Example**: `*-115.18.0esr-13.5-1*` + - [ ] Create new `tor-browser` branch protection rule: + - **Branch**: `tor-browser-$(ESR_VERSION)esr-13.5-1*` + - **Example**: `tor-browser-115.18.0esr-13.5-1*` - **Allowed to merge**: `Maintainers` - **Allowed to push and merge**: `Maintainers` - **Allowed to force push**: `false` ### **Identify the Firefox Tagged Commit and Create New Branches** -- [ ] Find the Firefox mercurial tag here: https://hg.mozilla.org/releases/mozilla-esr102/tags - - **Example**: `FIREFOX_115_18_0esr_BUILD1` -- [ ] Find the analogous `gecko-dev` commit: https://github.com/mozilla/gecko-dev - - **Tip**: Search for unique string (like the Differential Revision ID) found in the mercurial commit in the `gecko-dev/esr115` branch to find the equivalent commit - - **Example**: `293d490d2e8d9fbb91c76336288f1287cbe285fb` -- [ ] Sign and Tag `gecko-dev` commit - - Sign/Tag `gecko-dev` commit : - - **Tag**: `$(ESR_TAG)` - - **Message**: `Hg tag $(ESR_TAG)` -- [ ] Create new legacy `base-browser` branch from tag - - Branch name in the form: `base-browser-$(ESR_VERSION)esr-13.5-1` - - **Example**: `base-browser-115.18.0esr-13.5-1` +- [ ] Fetch Mozilla's firefox repo and identify this release's ESR-115 ${ESR_TAG} - [ ] Create new legacy `tor-browser` branch from - Branch name in the form: `tor-browser-$(ESR_VERSION)esr-13.5-1` - **Example**: `tor-browser-115.18.0esr-13.5-1` -- [ ] Push new `base-browser` branch to `upstream` - [ ] Push new `tor-browser` branch to `upstream` - [ ] Push new `$(ESR_TAG)` to `upstream` @@ -61,22 +49,13 @@ - [ ] Checkout a new local branch for the `tor-browser` rebase - **Example**: `git branch tor-browser-rebase FIREFOX_115_18_0esr_BUILD1` -- [ ] **(Optional)** `base-browser` rebase - - **NOTE** This step may be skipped if the `HEAD` of the previous `base-browser` branch is a `-buildN` tag - - [ ] Cherry-pick the previous `base-browser` commits up to `base-browser`'s `buildN` tag onto new `base-browser` rebase branch - - **Example**: `git cherry-pick FIREFOX_115_17_0esr_BUILD1..base-browser-115.17.0esr-13.5-1-build2` - - [ ] Rebase and autosquash these cherry-picked commits - - **Example**: `git rebase --autosquash --interactive FIREFOX_115_18_0esr_BUILD1 HEAD` - - [ ] Cherry-pick remainder of patches after the `buildN` tag - - **Example**: `git cherry-pick base-browser-115.17.0esr-13.5-1-build21..upstream/base-browser-115.17.0esr-13.5-1` - [ ] `tor-browser` rebase - [ ] Note the current git hash of `HEAD` for `tor-browser` rebase+autosquash step: `git rev-parse HEAD` - - [ ] Cherry-pick the appropriate previous `tor-browser` branch's commit range up to the last `tor-browser` `buildN` tag - - **Example**: `git cherry-pick base-browser-115.17.0esr-13.5-1-build1..tor-browser-115.17.0esr-13.5-1-build2 - - **Example (if separate base-browser rebase was skipped)**: `git cherry-pick FIREFOX_115_17_0esr_BUILD1..tor-browser-115.17.0esr-13.5-1-build2` + - [ ] Cherry-pick the appropriate previous `tor-browser` branch's commit range up to the last `tor-browser` `build1` tag + - **Example**: `git cherry-pick FIREFOX_115_17_0esr_BUILD1..tor-browser-115.17.0esr-13.5-1-build2` - [ ] Rebase and autosquash these newly cherry-picked commits: `git rebase --autosquash --interactive $(PREV_HEAD)` - **Example**: `git rebase --autosquash --interactive FIREFOX_115_18_0esr_BUILD1` - - [ ] Cherry-pick remainder of patches after the last `tor-browser` `buildN` tag + - [ ] Cherry-pick remainder of patches after the last `tor-browser` `build1` tag - **Example**: `git cherry-pick tor-browser-115.17.0esr-13.5-1-build1..upstream/tor-browser-115.17.0esr-13.5-1` - [ ] Rebase and autosquash again, this time replacing all `fixup` and `squash` commands with `pick`. The goal here is to have all of the `fixup` and `squash` commits beside the commit which they modify, but kept un-squashed for easy debugging/bisecting. - **Example**: `git rebase --autosquash --interactive FIREFOX_115_18_0esr_BUILD1` @@ -86,14 +65,11 @@ - `git diff $(ESR_TAG_PREV)..$(BROWSER_BRANCH_PREV) > current_patchset.diff` - `git diff $(ESR_TAG)..$(BROWSER_BRANCH) > rebased_patchset.diff` - diff `current_patchset.diff` and `rebased_patchset.diff` - - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` (unless the previous `base-browser` branch includes changes not included in the previous `tor-browser` branch) + - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD` - **Example**: `git range-dif FIREFOX_115_17_0esr_BUILD1..upstream/tor-browser-115.17.0esr-13.5-1 FIREFOX_115_18_0esr_BUILD1..HEAD` - [ ] Open MR for the `tor-browser` rebase - [ ] Merge -- Update and push `base-browser` branch - - [ ] Reset the new `base-browser` branch to the appropriate commit in this new `tor-browser` branch - - [ ] Push these commits to `upstream` ### **Sign and Tag** @@ -104,13 +80,6 @@ ./tools/browser/sign-tag.torbrowser legacy build1 ``` - [ ] Push tag to `upstream` -- [ ] Sign/Tag HEAD of the merged `base-browser` branch: - - In **tor-browser.git**, checkout the new legacy `base-browser` branch - - In **tor-browser-build.git**, run signing script: - ```bash - ./tools/browser/sign-tag.basebrowser legacy build1 - ``` - - [ ] Push tag to `upstream`  @@ -118,4 +87,4 @@ /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Rebase" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/063 Rebase - Rapid.md ===================================== @@ -128,9 +128,9 @@ gitGraph: - [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…: - [ ] Remove previous nightly `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) - - [ ] Create new `tor-browser` branch protection rule: - - **Branch**: `tor-browser-$(NIGHTLY_VERSION)-$(BROWSER_VERSION)-*` - - **Example**: `tor-browser-130.0a1-15.0-*` + - [ ] Create new `base-browser` and `tor-browser` branch protection rule: + - **Branch**: `(tor|base)-browser-$(NIGHTLY_VERSION)-$(BROWSER_VERSION)-*` + - **Example**: `(tor|base)-browser-130.0a1-15.0-*` - **Allowed to merge**: `Maintainers` - **Allowed to push and merge**: `Maintainers` - **Allowed to force push**: `false` @@ -138,15 +138,8 @@ gitGraph: ### **Create New Branches** -- [ ] Find the Firefox mercurial tag `$(NIGHTLY_TAG)` - - Go to https://hg.mozilla.org/mozilla-central/tags - - Find and inspect the commit tagged with `$(NIGHTLY_TAG)` - - Tags are in yellow in the Mercurial web UI - - Find the equivalent commit in https://github.com/mozilla/gecko-dev/commits/master - - **Notice**: GitHub sorts commits by time, you might want to use `git log gecko-dev/master` locally, instead - - Using the differential revision link is useful to quickly find the git commit - - Sign/Tag the `gecko-dev` commit: `git tag -as $(NIGHTLY_TAG) $(GIT_HASH) -m "Hg tag $(NIGHTLY_TAG)"` -- [ ] Create two new rapid `tor-browser` branches from Firefox mercurial tag +- [ ] Fetch Mozilla's firefox repo and identify this release's ${NIGHTLY_TAG} +- [ ] Create two new rapid `tor-browser` branches from Firefox ${NIGHTLY_TAG} - Branch name in the form: `tor-browser-$(NIGHTLY_VERSION)-$(BROWSER_VERSION)-${BRANCH_NUM}` - **Example**: `tor-browser-130.0a1-15.0-1` and `tor-browser-130.0a1-15.0-2` - [ ] Push new `tor-browser` branches and the `firefox` tag to `upstream` @@ -297,4 +290,4 @@ gitGraph: /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Rebase" -/label ~"Apps::Priority::High" +/label ~"Priority::High" ===================================== .gitlab/issue_templates/080 Security Backports.md ===================================== @@ -84,4 +84,4 @@ /label ~"Apps::Product::TorBrowser" /label ~"Apps::Product::MullvadBrowser" /label ~"Apps::Type::Backport" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/090 Emergency Security Issue.md ===================================== @@ -101,5 +101,5 @@ Godspeed! :pray: /label ~"Apps::Product::TorBrowser" /label ~"Apps::Product::MullvadBrowser" /label ~"Apps::Type::Bug" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" /label ~"Emergency" ===================================== .gitlab/issue_templates/100 Release QA - Desktop.md ===================================== @@ -209,4 +209,4 @@ Please lay claim to a platform in the comments: /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Test" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/101 Release QA - Android.md ===================================== @@ -104,4 +104,4 @@ Architectures: /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Test" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/110 Bugzilla Triage.md → .gitlab/issue_templates/110 Firefox Release Review.md ===================================== @@ -1,11 +1,13 @@ -# 📋 Bugzilla Triage +# 📋 Firefox Release Review **NOTE** This issue presumes the branches and tags for the next Firefox release have already been created in tor-browser.git +## Bugzilla Triage + - [ ] Generate Bugzilla triage CSV - Run (from `tor-browser-build` root): ```bash - ./tools/browser/generate-bugzilla-triage-csv ${FIREFOX_VERSION} ${PREVIOUS_NIGHTLY_TAG} ${NEXT_NIGHLTY_TAG} ${TRIAGE_ISSUE_NUMBER} ${REVIEWERS} > out.csv + ./tools/browser/generate-bugzilla-triage-csv ${FIREFOX_VERSION} ${PREVIOUS_NIGHTLY_TAG} ${NEXT_NIGHLTY_TAG} ${TRIAGE_ISSUE_NUMBER} > out.csv ``` - `${FIREFOX_VERSION}`: the major Firefox version of the nightly to review - **Example**: 129 @@ -15,42 +17,50 @@ - **Example**: `FIREFOX_NIGHTLY_129_END` - `${TRIAGE_ISSUE_NUMBER}`: this `tor-browser` issue - **Example**: `43303` - - `${REVIEWERS}`: `morgan` and two additional devs to triage this Firefox version - - `boklm` - - `brizental` - - `clairehurst` - - `dan` - - `henry` - - `jwilde` - - `ma1` - - `pierov` - **Example**: ```bash - ./tools/browser/generate-bugzilla-triage-csv 129 FIREFOX_NIGHTLY_128_END FIREFOX_NIGHTLY_129_END 43303 morgan pierov henry > 129.csv + ./tools/browser/generate-bugzilla-triage-csv 129 FIREFOX_NIGHTLY_128_END FIREFOX_NIGHTLY_129_END 43303 > 129.csv ``` - [ ] Attach the generated CSV file to the triage isssue - [ ] Import to Google Sheets ( https://sheets.google.com ) - - [ ] Create blank spreadsheet - - [ ] **Title**: `Bugzilla Triage ${VERSION}` - - [ ] Import CSV: File > Import > Upload + - Create blank spreadsheet + - **Title**: `Bugzilla Triage ${VERSION}` + - Import CSV: File > Import > Upload - **Import location**: "Replace spreadsheet" - **Separator type**: "Comma" - **Convert text to numbers, dates, and fomulas**: "✅" - - [ ] Convert 'Review' column's issue cells to check-boxes: + - Convert 'Review' column's issue cells to check-boxes: - Select relevant cells (i.e.: `A2:A1554` for in the 129 triage) - Insert > Checkbox - - [ ] Convert 'Triaged by' cells to check-boxes - - [ ] Share Spreadsheet + - Convert 'Triaged by' cells to check-boxes + - Share Spreadsheet - 🔒 Share > General access - Change `Restricted` to `Anyone with the link` - Post link in an internal note on this issue -- [ ] Page requested reviewers to this issue -- [ ] Triage Completed by: - - [ ] morgan +- [ ] Assign requested reviewers to this issue + +## Release Notes Review + + + +- [ ] Release Notes for Users (often includes multiple point releases): + - https://www.mozilla.org/en-US/firefox/${FIREFOX_VERSION}/releasenotes/ +- [ ] Release Notes for Developers + - https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Releases/${FIREFOX… + +--- + +- Bugzilla Triage and Release Notes Review Completed by: +  - [ ] reviewer 1  - [ ] reviewer 2  + - [ ] reviewer 3  -/label ~"esr-140" /label ~"Apps::Product::TorBrowser" -/label ~"Apps::Type::Audit" -/label ~"Apps::Priority::Blocker" +/label ~"Apps::Type::Triage" +/label ~"Priority::Blocker" +/milestone %"Tor Browser 16.0" ===================================== .gitlab/issue_templates/120 Bugzilla Audit.md ===================================== @@ -18,4 +18,4 @@ Title: /label ~"esr-140" /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Audit" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/Default.md ===================================== @@ -23,5 +23,5 @@ Please select the appropriate issue template from the **Description** drop-down. - 🚨 **Emergency Security Issue** - manage fixing and publishing a critical security fix - ✅ **Release QA - Desktop** - test and verify functionality of our Desktop release - ✅ **Release QA - Android** - test and verify functionality of our Android release -- 📋 **Bugzilla Triage** - identify upstream Firefox issues which need to be audited +- 📋 **Firefox Release Review** - identify upstream Firefox issues which need to be audited - 🔍 **Bugzilla Audit** - determine if/how an upstream change affects the browser View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2e5205… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2e5205… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] fixup! [android] Modify build system
by Pier Angelo Vendrame (＠pierov) 14 Aug '25

14 Aug '25

Pier Angelo Vendrame pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 2e520528 by Pier Angelo Vendrame at 2025-08-14T16:20:38+02:00 fixup! [android] Modify build system TB 43799: Check we passed the objdir to tba-sign-devbuilds.sh. When we initially created tba-sign-devbuilds.sh, it was easy to find the APKs. However, after Bug 1951190, they are inside the obj-* directory, which can be customized in mozconfig. So, the easiest way to deal with this, was to ask the caller to provide that obj directory. Not passing it will very likely make the script fail, so with this commit we added a check to output a more meaningful error message. - - - - - 1 changed file: - mobile/android/fenix/tools/tba-sign-devbuilds.sh Changes: ===================================== mobile/android/fenix/tools/tba-sign-devbuilds.sh ===================================== @@ -3,6 +3,10 @@ cd "$(dirname $(realpath "$0"))/.." objdir=$1 +if [ -z "$objdir" ]; then + echo "Usage $0 objdir" + exit 1 +fi if [ -z "$APKSIGNER_ARGS" ]; then if [ -z "$QA_KEY" ]; then View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2e52052… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2e52052… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.2.0esr-15.0-1] BB 44103: Remove ref-names from attr's .git_archival.txt.
by Pier Angelo Vendrame (＠pierov) 14 Aug '25

14 Aug '25

Pier Angelo Vendrame pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 0f93b817 by Pier Angelo Vendrame at 2025-08-14T16:15:42+02:00 BB 44103: Remove ref-names from attr's .git_archival.txt. The currently vendored copy of python-attrs's .git_archival.txt includes a ref-names field which might make source tarballs not reproducible. Upstream fixed this in da2333cd37747d692d5c78b0c94bd400ff883a9a, therefore we apply the same change until Mozilla vendors an updated copy of python-attrs. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1980103. - - - - - 1 changed file: - testing/web-platform/tests/tools/third_party/attrs/.git_archival.txt Changes: ===================================== testing/web-platform/tests/tools/third_party/attrs/.git_archival.txt ===================================== @@ -1,4 +1,3 @@ node: $Format:%H$ node-date: $Format:%cI$ describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$ -ref-names: $Format:%D$ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0f93b81… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0f93b81… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.2.0esr-15.0-1] BB 44103: Remove ref-names from attr's .git_archival.txt.
by Pier Angelo Vendrame (＠pierov) 14 Aug '25

14 Aug '25

Pier Angelo Vendrame pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 438d91c1 by Pier Angelo Vendrame at 2025-08-14T16:15:18+02:00 BB 44103: Remove ref-names from attr's .git_archival.txt. The currently vendored copy of python-attrs's .git_archival.txt includes a ref-names field which might make source tarballs not reproducible. Upstream fixed this in da2333cd37747d692d5c78b0c94bd400ff883a9a, therefore we apply the same change until Mozilla vendors an updated copy of python-attrs. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1980103. - - - - - 1 changed file: - testing/web-platform/tests/tools/third_party/attrs/.git_archival.txt Changes: ===================================== testing/web-platform/tests/tools/third_party/attrs/.git_archival.txt ===================================== @@ -1,4 +1,3 @@ node: $Format:%H$ node-date: $Format:%cI$ describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$ -ref-names: $Format:%D$ View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/438… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/438… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] BB 44103: Remove ref-names from attr's .git_archival.txt.
by Pier Angelo Vendrame (＠pierov) 14 Aug '25

14 Aug '25

Pier Angelo Vendrame pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 6615e6b1 by Pier Angelo Vendrame at 2025-08-14T16:09:20+02:00 BB 44103: Remove ref-names from attr's .git_archival.txt. The currently vendored copy of python-attrs's .git_archival.txt includes a ref-names field which might make source tarballs not reproducible. Upstream fixed this in da2333cd37747d692d5c78b0c94bd400ff883a9a, therefore we apply the same change until Mozilla vendors an updated copy of python-attrs. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1980103. - - - - - 1 changed file: - testing/web-platform/tests/tools/third_party/attrs/.git_archival.txt Changes: ===================================== testing/web-platform/tests/tools/third_party/attrs/.git_archival.txt ===================================== @@ -1,4 +1,3 @@ node: $Format:%H$ node-date: $Format:%cI$ describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$ -ref-names: $Format:%D$ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6615e6b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6615e6b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.2.0esr-15.0-1] 5 commits: fixup! Firefox preference overrides.
by henry (＠henry) 14 Aug '25

14 Aug '25

henry pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 6c092f84 by Henry Wilkes at 2025-08-14T14:46:32+01:00 fixup! Firefox preference overrides. TB 44045: Disable ML features. - - - - - 50b3fadd by Henry Wilkes at 2025-08-14T14:46:34+01:00 BB 44045: Disable ML features. - - - - - 127d31fe by Henry Wilkes at 2025-08-14T14:47:08+01:00 fixup! BB 42027: Base Browser migration procedures. TB 44045: Clear the user values for the now locked ML preferences. - - - - - 655796df by Henry Wilkes at 2025-08-14T14:47:32+01:00 fixup! fixup! BB 42027: Base Browser migration procedures. TB 44045: Move changes to the correct target. - - - - - a4f4265d by Henry Wilkes at 2025-08-14T14:47:53+01:00 fixup! BB 44045: Disable ML features. TB 44045: Moved changes to the correct target. - - - - - 34 changed files: - browser/app/profile/001-base-profile.js - browser/base/content/browser-init.js - browser/base/content/nsContextMenu.sys.mjs - browser/components/BrowserComponents.manifest - browser/components/BrowserGlue.sys.mjs - browser/components/DesktopActorRegistry.sys.mjs - browser/components/moz.build - browser/components/preferences/main.js - browser/components/sidebar/sidebar-main.mjs - browser/components/tabbrowser/content/tabbrowser.js - browser/components/tabbrowser/content/tabgroup-menu.js - browser/components/tabbrowser/moz.build - browser/components/translations/content/selectTranslationsPanel.js - browser/components/urlbar/QuickSuggest.sys.mjs - browser/components/urlbar/UrlbarProvidersManager.sys.mjs - browser/components/urlbar/moz.build - docshell/base/nsAboutRedirector.cpp - docshell/build/components.conf - toolkit/components/extensions/ext-toolkit.json - toolkit/components/extensions/parent/ext-trial-ml.js - toolkit/components/formautofill/MLAutofill.sys.mjs - toolkit/components/moz.build - toolkit/components/pdfjs/content/PdfjsParent.sys.mjs - toolkit/components/places/moz.build - toolkit/components/translations/actors/TranslationsChild.sys.mjs - toolkit/components/translations/actors/TranslationsParent.sys.mjs - toolkit/components/translations/actors/moz.build - toolkit/components/translations/jar.mn - toolkit/modules/ActorManagerParent.sys.mjs - toolkit/mozapps/extensions/content/aboutaddons.js - toolkit/mozapps/extensions/content/components/addon-mlmodel-details.mjs - toolkit/mozapps/extensions/content/components/mlmodel-card-list-additions.mjs - toolkit/mozapps/extensions/extensions.manifest - toolkit/mozapps/extensions/internal/moz.build The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/04… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/04… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.2.0esr-15.0-1] 5 commits: fixup! Firefox preference overrides.
by henry (＠henry) 14 Aug '25

14 Aug '25

henry pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 3b2039dd by Henry Wilkes at 2025-08-14T14:34:56+01:00 fixup! Firefox preference overrides. TB 44045: Disable ML features. - - - - - 1005107f by Henry Wilkes at 2025-08-14T14:34:57+01:00 BB 44045: Disable ML features. - - - - - 6ba5cf4e by Henry Wilkes at 2025-08-14T14:35:30+01:00 fixup! BB 42027: Base Browser migration procedures. TB 44045: Clear the user values for the now locked ML preferences. - - - - - da82f3dc by Henry Wilkes at 2025-08-14T14:36:08+01:00 fixup! fixup! BB 42027: Base Browser migration procedures. TB 44045: Move changes to the correct target. - - - - - 1f9ecedd by Henry Wilkes at 2025-08-14T14:36:38+01:00 fixup! BB 44045: Disable ML features. TB 44045: Moved changes to the correct target. - - - - - 34 changed files: - browser/app/profile/001-base-profile.js - browser/base/content/browser-init.js - browser/base/content/nsContextMenu.sys.mjs - browser/components/BrowserComponents.manifest - browser/components/BrowserGlue.sys.mjs - browser/components/DesktopActorRegistry.sys.mjs - browser/components/moz.build - browser/components/preferences/main.js - browser/components/sidebar/sidebar-main.mjs - browser/components/tabbrowser/content/tabbrowser.js - browser/components/tabbrowser/content/tabgroup-menu.js - browser/components/tabbrowser/moz.build - browser/components/translations/content/selectTranslationsPanel.js - browser/components/urlbar/QuickSuggest.sys.mjs - browser/components/urlbar/UrlbarProvidersManager.sys.mjs - browser/components/urlbar/moz.build - docshell/base/nsAboutRedirector.cpp - docshell/build/components.conf - toolkit/components/extensions/ext-toolkit.json - toolkit/components/extensions/parent/ext-trial-ml.js - toolkit/components/formautofill/MLAutofill.sys.mjs - toolkit/components/moz.build - toolkit/components/pdfjs/content/PdfjsParent.sys.mjs - toolkit/components/places/moz.build - toolkit/components/translations/actors/TranslationsChild.sys.mjs - toolkit/components/translations/actors/TranslationsParent.sys.mjs - toolkit/components/translations/actors/moz.build - toolkit/components/translations/jar.mn - toolkit/modules/ActorManagerParent.sys.mjs - toolkit/mozapps/extensions/content/aboutaddons.js - toolkit/mozapps/extensions/content/components/addon-mlmodel-details.mjs - toolkit/mozapps/extensions/content/components/mlmodel-card-list-additions.mjs - toolkit/mozapps/extensions/extensions.manifest - toolkit/mozapps/extensions/internal/moz.build The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/321081… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/321081… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] 2 commits: fixup! fixup! BB 42027: Base Browser migration procedures.
by henry (＠henry) 14 Aug '25

14 Aug '25

henry pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 805f0463 by Henry Wilkes at 2025-08-14T13:57:59+01:00 fixup! fixup! BB 42027: Base Browser migration procedures. TB 44045: Move changes to the correct target. - - - - - 297a2657 by Henry Wilkes at 2025-08-14T13:59:30+01:00 fixup! BB 44045: Disable ML features. TB 44045: Moved changes to the correct target. - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3d9e0f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3d9e0f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] 3 commits: fixup! Firefox preference overrides.
by henry (＠henry) 14 Aug '25

14 Aug '25

henry pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: a9e3e59d by Henry Wilkes at 2025-08-14T12:48:15+00:00 fixup! Firefox preference overrides. TB 44045: Disable ML features. - - - - - 4e051223 by Henry Wilkes at 2025-08-14T12:48:15+00:00 BB 44045: Disable ML features. - - - - - 3d9e0f87 by Henry Wilkes at 2025-08-14T12:48:15+00:00 fixup! BB 42027: Base Browser migration procedures. TB 44045: Clear the user values for the now locked ML preferences. - - - - - 34 changed files: - browser/app/profile/001-base-profile.js - browser/base/content/browser-init.js - browser/base/content/nsContextMenu.sys.mjs - browser/components/BrowserComponents.manifest - browser/components/BrowserGlue.sys.mjs - browser/components/DesktopActorRegistry.sys.mjs - browser/components/moz.build - browser/components/preferences/main.js - browser/components/sidebar/sidebar-main.mjs - browser/components/tabbrowser/content/tabbrowser.js - browser/components/tabbrowser/content/tabgroup-menu.js - browser/components/tabbrowser/moz.build - browser/components/translations/content/selectTranslationsPanel.js - browser/components/urlbar/QuickSuggest.sys.mjs - browser/components/urlbar/UrlbarProvidersManager.sys.mjs - browser/components/urlbar/moz.build - docshell/base/nsAboutRedirector.cpp - docshell/build/components.conf - toolkit/components/extensions/ext-toolkit.json - toolkit/components/extensions/parent/ext-trial-ml.js - toolkit/components/formautofill/MLAutofill.sys.mjs - toolkit/components/moz.build - toolkit/components/pdfjs/content/PdfjsParent.sys.mjs - toolkit/components/places/moz.build - toolkit/components/translations/actors/TranslationsChild.sys.mjs - toolkit/components/translations/actors/TranslationsParent.sys.mjs - toolkit/components/translations/actors/moz.build - toolkit/components/translations/jar.mn - toolkit/modules/ActorManagerParent.sys.mjs - toolkit/mozapps/extensions/content/aboutaddons.js - toolkit/mozapps/extensions/content/components/addon-mlmodel-details.mjs - toolkit/mozapps/extensions/content/components/mlmodel-card-list-additions.mjs - toolkit/mozapps/extensions/extensions.manifest - toolkit/mozapps/extensions/internal/moz.build The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/fcd62e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/fcd62e… You're receiving this email because of your account on gitlab.torproject.org.

1 0