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/4…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4…
You're receiving this email because of your account on gitlab.torproject.org.
morgan pushed to branch mullvad-browser-128.4.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser
Commits:
8d27898b by Morgan at 2024-11-14T02:01:24+00:00
fixup! MB 188: Customize Gitlab Issue and Merge templates
- - - - -
35c0859d by Morgan at 2024-11-14T02:01:43+00:00
fixup! Adding issue and merge request templates
Bug 43295: Update MR templates
- - - - -
5c8645ae by Morgan at 2024-11-14T02:04:59+00:00
fixup! MB 188: Customize Gitlab Issue and Merge templates
Bug 43295: Update MR templates
- - - - -
4 changed files:
- .gitlab/issue_templates/Emergency Security Issue.md
- − .gitlab/issue_templates/Rebase Browser - Alpha.md
- − .gitlab/issue_templates/Rebase Browser - Stable.md
- .gitlab/merge_request_templates/default.md
Changes:
=====================================
.gitlab/issue_templates/Emergency Security Issue.md
=====================================
@@ -18,7 +18,9 @@
### Type of Issue: What are we dealing with?
- [ ] Security (sandbox escape, remote code execution, etc)
-- [ ] Cross-Site Linkability (correlating sessions across websites)
+- [ ] Proxy Bypass (traffic contents becoming MITM'able)
+- [ ] De-Anonymization (otherwise identifying which website a user is visiting)
+- [ ] Cross-Site Linkability (correlating sessions across circuits and websites)
- [ ] Disk Leak (persisting session information to disk)
- [ ] Other (please explain)
@@ -34,11 +36,16 @@
- [ ] **richard** : signing, release
- [ ] **thorin** : fingerprinting
- [ ] Other Engineering Teams
+ - [ ] Networking (**ahf**, **dgoulet**)
+ - [ ] Anti-Censorship (**meskio**, **cohosh**)
- [ ] UX (**donuts**)
- [ ] TPA (**anarcat**, **lavamind**)
- [ ] External Tor Partners
- - [ ] Mozilla (**tjr**)
- - [ ] Mullvad (**ruihildt**)
+ - [ ] Mozilla
+ - [ ] Mullvad
+ - [ ] Brave
+ - [ ] Guardian Project (Orbot, Onion Browser)
+ - [ ] Tails
- [ ] Other (please list)
### Urgency: When do we need to act?
@@ -65,7 +72,6 @@ Sometimes fixes have side-effects: users lose their data, roadmaps need to be ad
- [ ] Start an initial email thread with the following people:
- [ ] **bella**
- - [ ] **ruihildt**, **support(a)mullvadvpn.net**
- [ ] Relevant Applications Developers
- [ ] **(Optional)** **micah**
- if there are considerations or asks outside the Applications Team
@@ -78,7 +84,6 @@ Sometimes fixes have side-effects: users lose their data, roadmaps need to be ad
/cc @ma1
/cc @micah
/cc @richard
-/cc @ruihildt
/confidential
=====================================
.gitlab/issue_templates/Rebase Browser - Alpha.md deleted
=====================================
@@ -1,83 +0,0 @@
-**NOTE:** All examples in this template reference the rebase from 102.7.0esr to 102.8.0esr
-
-<details>
- <summary>Explanation of Variables</summary>
-
-- `$(ESR_VERSION)`: the Mozilla defined ESR version, used in various places for building mullvad-browser tags, labels, etc
- - **Example**: `102.8.0`
-- `$(ESR_TAG)`: the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)`
- - **Example**: `FIREFOX_102_8_0esr_RELEASE`
-- `$(BROWSER_MAJOR)`: the browser major version
- - **Example**: `12`
-- `$(BROWSER_MINOR)`: the browser minor version
- - **Example**: either `0` or `5`; Alpha's is always `(Stable + 5) % 10`
-- `$(BASE_BROWSER_BRANCH)`: the full name of the current `base-browser` branch
- - **Example**: `base-browser-102.8.0esr-12.5-1`
-- `$(BASE_BROWSER_BRANCH_PREV)`: the full name of the previous `base-browser` branch
- - **Example**: `base-browser-102.7.0esr-12.5-1`
-- `$(BASE_BROWSER_BRANCH_TAG)`: the `base-browser` build tag used as base commit for `mullvad-browser`
- - **Example**: `base-browser-102.8.0esr-12.5-1-build1`
-- `$(BASE_BROWSER_BRANCH_PREV_TAG)`: the `base-browser` build tag used as base commit for the previous `mullvad-browser`
- - **Example**: `base-browser-102.7.0esr-12.5-1-build1`
-- `$(MULLVAD_BROWSER_BRANCH)`: the full name of the current `mullvad-browser` branch
- - **Example**: `mullvad-browser-102.8.0esr-12.5-1`
-- `$(MULLVAD_BROWSER_BRANCH_PREV)`: the full name of the previous `mullvad-browser` branch
- - **Example**: `mullvad-browser-102.7.0esr-12.5-1`
-</details>
-
-**NOTE:** It is assumed that we've already rebased and tagged `base-browser` alpha and that we've already rebased `mullvad-browser` stable
-
-### **Bookkeeping**
-
-- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue.
-
-### Update Branch Protection Rules
-
-- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/…:
- - [ ] Remove previous alpha `mullvad-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased)
- - [ ] Create new `mullvad-browser` branch protection rule:
- - **Branch**: `mullvad-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*`
- - **Example**: `mullvad-browser-102.8.0esr-12.5-1*`
- - **Allowed to merge**: `Maintainers`
- - **Allowed to push and merge**: `Maintainers`
- - **Allowed to force push**: `false`
-
-### **Create and Push New Branch**
-
-- [ ] Create new alpha `mullvad-browser` branch from this ESR's alpha `base-browser` tag
- - Branch name in the form: `mullvad-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1`
- - **Example**: `git branch mullvad-browser-102.8.0esr-12.5-1 base-browser-102.8.0esr-12.5-1-build1`
-- [ ] Push new `mullvad-browser` branch to `upstream`
-- [ ] Push `base-browser` tag to `upstream`
-
-### **Rebase tor-browser**
-
-- [ ] Checkout a new local branch for the `mullvad-browser` rebase
- - **Example**: `git branch mullvad-browser-rebase upstream/mullvad-browser-102.8.0esr-12.5-1`
-- [ ] `mullvad-browser` rebase
- - [ ] Cherry-pick the previous `mullvad-browser` branch's commit range up to the last `mullvad-browser` `build1` tag
- - **Example**: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1..mullvad-browser-102.7.0esr-12.5-1-build1`
- - [ ] Rebase and autosquash these newly cherry-picked commits
- - **Example**: `git rebase --autosquash --interactive upstream/mullvad-browser-102.8.0esr-12.5-1`
- - [ ] Cherry-pick remainder of patches after the last `mullvad-browser` `buildN` tag
- - **Example**: `git cherry-pick mullvad-browser-102.7.0esr-12.5-1-build1..upstream/mulvad-browser-102.7.0esr-12.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 upstream/mullvad-browser-102.8.0esr-12.5-1`
-- [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution:
- - [ ] diff of diffs:
- - Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred difftool and look at differences on lines that starts with + or -
- - `git diff $(BASE_BROWSER_BRANCH_PREV_TAG)..$(MULLVAD_BROWSER_BRANCH_PREV) > current_patchset.diff`
- - `git diff $(BASE_BROWSER_BRANCH_TAG)..HEAD > 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 `mullvad-browser` branch)
- - [ ] rangediff: `git range-diff $(BASE_BROWSER_BRANCH_PREV_TAG)..$(MULLVAD_BROWSER_BRANCH_PREV) $(BASE_BROWSER_BRANCH_TAG)..HEAD`
- - **Example**: `git range-diff base-browser-102.7.0esr-12.5-1-build1..upstream/mullvad-browser-102.7.0esr-12.5-1 base-browser-102.8.0esr-12.5-1-build1..HEAD`
-- [ ] Open MR for the `mullvad-browser` rebase
-- [ ] Merge
-
-### **Sign and Tag**
-
-- [ ] Sign/Tag `HEAD` of the merged `mullvad-browser` branch:
- - **Tag**: `mullvad-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1`
- - **Message**: `Tagging build1 for $(ESR_VERSION)esr-based stable`
- - [ ] Push tag to `upstream`
=====================================
.gitlab/issue_templates/Rebase Browser - Stable.md deleted
=====================================
@@ -1,84 +0,0 @@
-**NOTE:** All examples in this template reference the rebase from 102.7.0esr to 102.8.0esr
-
-<details>
- <summary>Explanation of Variables</summary>
-
-- `$(ESR_VERSION)`: the Mozilla defined ESR version, used in various places for building mullvad-browser tags, labels, etc
- - **Example**: `102.8.0`
-- `$(ESR_TAG)`: the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)`
- - **Example**: `FIREFOX_102_8_0esr_RELEASE`
-- `$(BROWSER_MAJOR)`: the browser major version
- - **Example**: `12`
-- `$(BROWSER_MINOR)`: the browser minor version
- - **Example**: either `0` or `5`; Alpha's is always `(Stable + 5) % 10`
-- `$(BASE_BROWSER_BRANCH)`: the full name of the current `base-browser` branch
- - **Example**: `base-browser-102.8.0esr-12.0-1`
-- `$(BASE_BROWSER_BRANCH_PREV)`: the full name of the previous `base-browser` branch
- - **Example**: `base-browser-102.7.0esr-12.0-1`
-- `$(BASE_BROWSER_BRANCH_TAG)`: the `base-browser` build tag used as base commit for `mullvad-browser`
- - **Example**: `base-browser-102.8.0esr-12.0-1-build1`
-- `$(BASE_BROWSER_BRANCH_PREV_TAG)`: the `base-browser` build tag used as base commit for the previous `mullvad-browser`
- - **Example**: `base-browser-102.7.0esr-12.0-1-build1`
-- `$(MULLVAD_BROWSER_BRANCH)`: the full name of the current `mullvad-browser` branch
- - **Example**: `mullvad-browser-102.8.0esr-12.0-1`
-- `$(MULLVAD_BROWSER_BRANCH_PREV)`: the full name of the previous `mullvad-browser` branch
- - **Example**: `mullvad-browser-102.7.0esr-12.0-1`
-</details>
-
-**NOTE:** It is assumed that we've already rebased and tagged `base-browser` stable
-
-### **Bookkeeping**
-
-- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue.
-
-### Update Branch Protection Rules
-
-- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/…:
- - [ ] Remove previous stable `mullvad-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased)
- - [ ] Create new `mullvad-browser` branch protection rule:
- - **Branch**: `mullvad-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*`
- - **Example**: `mullvad-browser-102.8.0esr-12.0-1*`
- - **Allowed to merge**: `Maintainers`
- - **Allowed to push and merge**: `Maintainers`
- - **Allowed to force push**: `false`
-
-### **Create and Push New Branch**
-
-- [ ] Create new stable `mullvad-browser` branch from this ESR's stable `base-browser` tag
- - Branch name in the form: `mullvad-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1`
- - **Example**: `git branch mullvad-browser-102.8.0esr-12.0-1 base-browser-102.8.0esr-12.0-1-build1`
-- [ ] Push new `mullvad-browser` branch to `upstream`
-- [ ] Push `base-browser` tag to `upstream`
-- [ ] Push `$(ESR_TAG)` to `upstream`
-
-### **Rebase mullvad-browser**
-
-- [ ] Checkout a new local branch for the `mullvad-browser` rebase
- - **Example**: `git branch mullvad-browser-rebase upstream/mullvad-browser-102.8.0esr-12.0-1`
-- [ ] `mullvad-browser` rebase
- - [ ] Cherry-pick the previous `mullvad-browser` branch's commit range up to the last `mullvad-browser` `build1` tag
- - **Example**: `git cherry-pick base-browser-102.7.0esr-12.0-1-build1..mullvad-browser-102.7.0esr-12.0-1-build1`
- - [ ] Rebase and autosquash these newly cherry-picked commits
- - **Example**: `git rebase --autosquash --interactive upstream/mullvad-browser-102.8.0esr-12.0-1`
- - [ ] Cherry-pick remainder of patches after the last `mullvad-browser` `buildN` tag
- - **Example**: `git cherry-pick mullvad-browser-102.7.0esr-12.0-1-build1..upstream/mullvad-browser-102.7.0esr-12.0-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 upstream/mullvad-browser-102.8.0esr-12.0-1`
-- [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution:
- - [ ] diff of diffs:
- - Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred difftool and look at differences on lines that starts with + or -
- - `git diff $(BASE_BROWSER_BRANCH_PREV_TAG)..$(MULLVAD_BROWSER_BRANCH_PREV) > current_patchset.diff`
- - `git diff $(BASE_BROWSER_BRANCH_TAG)..HEAD > 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 `mullvad-browser` branch)
- - [ ] rangediff: `git range-diff $(BASE_BROWSER_BRANCH_PREV_TAG)..$(MULLVAD_BROWSER_BRANCH_PREV) $(BASE_BROWSER_BRANCH_TAG)..HEAD`
- - **Example**: `git range-diff base-browser-102.7.0esr-12.0-1-build1..upstream/mullvad-browser-102.7.0esr-12.5-1 base-browser-102.8.0esr-12.5-1-build1..HEAD`
-- [ ] Open MR for the `mullvad-browser` rebase
-- [ ] Merge
-
-### **Sign and Tag**
-
-- [ ] Sign/Tag `HEAD` of the merged `mullvad-browser` branch:
- - **Tag**: `mullvad-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1-build1`
- - **Message**: `Tagging build1 for $(ESR_VERSION)esr-based stable`
- - [ ] Push tag to `upstream`
=====================================
.gitlab/merge_request_templates/default.md
=====================================
@@ -2,18 +2,41 @@
<!-- Bookkeeping information for release management -->
-### Related Issues
+### Issues
+
+#### Resolves
+- mullvad-browser#xxxxx
- tor-browser#xxxxx
+- tor-browser-build#xxxxx
+
+#### Related
+
- mullvad-browser#xxxxx
+- tor-browser#xxxxx
- tor-browser-build#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
+
+- [ ] **`mullvad-browser`** - `!fixups` to `mullvad-browser`-specific commits, new features, security backports
+- [ ] **`base-browser`** *and* **`tor-browser`** - `!fixups` to `base-browser`-specific commits or new features to be shared with `tor-browser`
+ - ⚠️ **IMPORTANT**: Please list the `base-browser`-specific commits which need to be cherry-picked to the `base-browser` and `tor-browser` branches here
+
+#### Target Channels
+
+- [ ] **Alpha**: esr128-14.5
+- [ ] **Stable**: esr128-14.0
+
### 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
@@ -23,11 +46,6 @@
- [ ] **Localization**: typos and other localization changes that should be also in the release branch
- [ ] **Other**: please explain
-### Merging
-- [ ] Merge to `mullvad-browser` - `!fixups` to `mullvad-browser`-specific commits, new features, security backports
-- [ ] Merge to `base-browser` -`!fixups` to `base-browser`-specific commits, new features to be shared with `tor-browser`
- - **NOTE**: if your changeset includes patches to both `base-browser` and `mullvad-browser` please clearly label in the change description which commits should be cherry-picked to `base-browser` after merging
-
### Issue Tracking
- [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation
@@ -36,7 +54,7 @@
#### Request Reviewer
- [ ] Request review from an applications developer depending on modified system:
- - **NOTE**: if the MR modifies multiple areas, please `/cc` all the relevant reviewers (since gitlab only allows 1 reviewer)
+ - **NOTE**: if the MR modifies multiple areas, please `/cc` all the relevant reviewers (since Gitlab only allows 1 reviewer)
- **accessibility** : henry
- **android** : clairehurst, dan
- **build system** : boklm
@@ -44,21 +62,22 @@
- **firefox internals (XUL/JS/XPCOM)** : jwilde, ma1
- **fonts** : pierov
- **frontend (implementation)** : henry
- - **frontend (review)** : donuts, richard
+ - **frontend (review)** : donuts, morgan
- **localization** : henry, pierov
- **macOS** : clairehurst, dan
- **nightly builds** : boklm
- - **rebases/release-prep** : dan, ma1, pierov, richard
+ - **rebases/release-prep** : dan, ma1, pierov, morgan
- **security** : jwilde, ma1
- - **signing** : boklm, richard
+ - **signing** : boklm, morgan
- **updater** : pierov
- - **windows** : jwilde, richard
- - **misc/other** : pierov, richard
+ - **windows** : jwilde, morgan
+ - **misc/other** : pierov, morgan
#### 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 -->
+
#### How Tested
<!-- Description of steps taken to verify the change -->
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/b5…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/b5…
You're receiving this email because of your account on gitlab.torproject.org.
morgan pushed to branch tor-browser-128.4.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits:
38620b67 by Morgan at 2024-11-14T01:57:48+00:00
fixup! Adding issue and merge request templates
Bug 43295: Update MR templates
- - - - -
1 changed file:
- .gitlab/merge_request_templates/default.md
Changes:
=====================================
.gitlab/merge_request_templates/default.md
=====================================
@@ -2,18 +2,42 @@
<!-- Bookkeeping information for release management -->
-### Related Issues
+### Issues
+
+#### Resolves
- tor-browser#xxxxx
- mullvad-browser#xxxxx
- tor-browser-build#xxxxx
+#### Related
+
+- tor-browser#xxxxx
+- mullvad-browser#xxxxx
+- tor-browser-build#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
+
+- [ ] **`tor-browser`** - `!fixups` to `tor-browser`-specific commits, new features, security backports
+- [ ] **`base-browser`** *and* **`mullvad-browser`** - `!fixups` to `base-browser`-specific commits, new features to be shared with `mullvad-browser`, and security backports
+ - ⚠️ **IMPORTANT**: Please list the `base-browser`-specific commits which need to be cherry-picked to the `base-browser` and `mullvad-browser` branches here
+
+#### Target Channels
+
+- [ ] **Alpha**: esr128-14.5
+- [ ] **Stable**: esr128-14.0
+- [ ] **Legacy**: 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
@@ -24,11 +48,6 @@
- [ ] **Localization**: typos and other localization changes that should be also in the release branch
- [ ] **Other**: please explain
-### Merging
-- [ ] Merge to `tor-browser` - `!fixups` to `tor-browser`-specific commits, new features, security backports
-- [ ] Merge to `base-browser` - `!fixups` to `base-browser`-specific commits, new features to be shared with `mullvad-browser`, and security backports
- - **NOTE**: if your changeset includes patches to both `base-browser` and `tor-browser` please clearly label in the change description which commits should be cherry-picked to `base-browser` after merging
-
### Issue Tracking
- [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation
@@ -37,7 +56,7 @@
#### Request Reviewer
- [ ] Request review from an applications developer depending on modified system:
- - **NOTE**: if the MR modifies multiple areas, please `/cc` all the relevant reviewers (since gitlab only allows 1 reviewer)
+ - **NOTE**: if the MR modifies multiple areas, please `/cc` all the relevant reviewers (since Gitlab only allows 1 reviewer)
- **accessibility** : henry
- **android** : clairehurst, dan
- **build system** : boklm
@@ -45,21 +64,22 @@
- **firefox internals (XUL/JS/XPCOM)** : jwilde, ma1
- **fonts** : pierov
- **frontend (implementation)** : henry
- - **frontend (review)** : donuts, richard
+ - **frontend (review)** : donuts, morgan
- **localization** : henry, pierov
- **macOS** : clairehurst, dan
- **nightly builds** : boklm
- - **rebases/release-prep** : dan, ma1, pierov, richard
+ - **rebases/release-prep** : dan, ma1, pierov, morgan
- **security** : jwilde, ma1
- - **signing** : boklm, richard
+ - **signing** : boklm, morgan
- **updater** : pierov
- - **windows** : jwilde, richard
- - **misc/other** : pierov, richard
+ - **windows** : jwilde, morgan
+ - **misc/other** : pierov, morgan
#### 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 -->
+
#### How Tested
<!-- Description of steps taken to verify the change -->
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/38620b6…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/38620b6…
You're receiving this email because of your account on gitlab.torproject.org.
morgan pushed to branch base-browser-128.4.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits:
56ffe58d by Morgan at 2024-11-14T01:56:46+00:00
fixup! Adding issue and merge request templates
Bug 43295: Update MR templates
- - - - -
1 changed file:
- .gitlab/merge_request_templates/default.md
Changes:
=====================================
.gitlab/merge_request_templates/default.md
=====================================
@@ -2,18 +2,42 @@
<!-- Bookkeeping information for release management -->
-### Related Issues
+### Issues
+
+#### Resolves
- tor-browser#xxxxx
- mullvad-browser#xxxxx
- tor-browser-build#xxxxx
+#### Related
+
+- tor-browser#xxxxx
+- mullvad-browser#xxxxx
+- tor-browser-build#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
+
+- [ ] **`tor-browser`** - `!fixups` to `tor-browser`-specific commits, new features, security backports
+- [ ] **`base-browser`** *and* **`mullvad-browser`** - `!fixups` to `base-browser`-specific commits, new features to be shared with `mullvad-browser`, and security backports
+ - ⚠️ **IMPORTANT**: Please list the `base-browser`-specific commits which need to be cherry-picked to the `base-browser` and `mullvad-browser` branches here
+
+#### Target Channels
+
+- [ ] **Alpha**: esr128-14.5
+- [ ] **Stable**: esr128-14.0
+- [ ] **Legacy**: 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
@@ -24,11 +48,6 @@
- [ ] **Localization**: typos and other localization changes that should be also in the release branch
- [ ] **Other**: please explain
-### Merging
-- [ ] Merge to `tor-browser` - `!fixups` to `tor-browser`-specific commits, new features, security backports
-- [ ] Merge to `base-browser` - `!fixups` to `base-browser`-specific commits, new features to be shared with `mullvad-browser`, and security backports
- - **NOTE**: if your changeset includes patches to both `base-browser` and `tor-browser` please clearly label in the change description which commits should be cherry-picked to `base-browser` after merging
-
### Issue Tracking
- [ ] Link resolved issues with appropriate [Release Prep issue](https://gitlab.torproject.org/groups/tpo/applications/-/issues/?sort… for changelog generation
@@ -37,7 +56,7 @@
#### Request Reviewer
- [ ] Request review from an applications developer depending on modified system:
- - **NOTE**: if the MR modifies multiple areas, please `/cc` all the relevant reviewers (since gitlab only allows 1 reviewer)
+ - **NOTE**: if the MR modifies multiple areas, please `/cc` all the relevant reviewers (since Gitlab only allows 1 reviewer)
- **accessibility** : henry
- **android** : clairehurst, dan
- **build system** : boklm
@@ -45,21 +64,22 @@
- **firefox internals (XUL/JS/XPCOM)** : jwilde, ma1
- **fonts** : pierov
- **frontend (implementation)** : henry
- - **frontend (review)** : donuts, richard
+ - **frontend (review)** : donuts, morgan
- **localization** : henry, pierov
- **macOS** : clairehurst, dan
- **nightly builds** : boklm
- - **rebases/release-prep** : dan, ma1, pierov, richard
+ - **rebases/release-prep** : dan, ma1, pierov, morgan
- **security** : jwilde, ma1
- - **signing** : boklm, richard
+ - **signing** : boklm, morgan
- **updater** : pierov
- - **windows** : jwilde, richard
- - **misc/other** : pierov, richard
+ - **windows** : jwilde, morgan
+ - **misc/other** : pierov, morgan
#### 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 -->
+
#### How Tested
<!-- Description of steps taken to verify the change -->
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/56ffe58…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/56ffe58…
You're receiving this email because of your account on gitlab.torproject.org.
morgan pushed to branch maint-14.0 at The Tor Project / Applications / tor-browser-build
Commits:
a6600db7 by Morgan at 2024-11-14T00:08:29+00:00
Bug 41291: Enable mingw changes for WebRTC unconditionally
- - - - -
2272e06e by Morgan at 2024-11-14T00:09:41+00:00
Bug 41299: Mullvad Browser 14.0 build2
- - - - -
3 changed files:
- projects/mingw-w64-clang/build
- projects/mingw-w64-clang/config
- rbm.conf
Changes:
=====================================
projects/mingw-w64-clang/build
=====================================
@@ -89,9 +89,7 @@ EOF
patch -p1 < "$rootdir/mingw-dispatchqueue.patch"
patch -p1 < "$rootdir/mingw-ts_sd.patch"
patch -p1 < "$rootdir/mingw-composition.patch"
- [% IF !c("var/release") %]
- patch -p1 < "$rootdir/mingw-webrtc.patch"
- [% END %]
+ patch -p1 < "$rootdir/mingw-webrtc.patch"
cd $builddir/mingw-w64-clang/mingw-w64-headers
mkdir build && cd build
=====================================
projects/mingw-w64-clang/config
=====================================
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% pc("llvm-project", "version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64
-git_hash: '[% IF c("var/release") %]cd4cf9b279f8fb0815f8b9665d3cea60a30290bc[% ELSE %]4ef04b0a7f7a20735de2f58b5c0496fcb4c7d191[% END -%]'
+git_hash: '4ef04b0a7f7a20735de2f58b5c0496fcb4c7d191'
version: '[% c("abbrev") %]'
container:
use_container: 1
@@ -36,4 +36,3 @@ input_files:
- filename: mingw-ts_sd.patch
- filename: mingw-composition.patch
- filename: mingw-webrtc.patch
- enable: '[% !c("var/release") %]'
\ No newline at end of file
=====================================
rbm.conf
=====================================
@@ -74,7 +74,7 @@ buildconf:
var:
torbrowser_version: '[% IF c("var/tor-browser") %]14.0.2[% ELSE %]14.0[% END %]'
- torbrowser_build: 'build1'
+ torbrowser_build: 'build2'
# This should be the date of when the build is started. For the build
# to be reproducible, browser_release_date should always be in the past.
browser_release_date: '2024/11/12 20:16:21'
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/…
You're receiving this email because of your account on gitlab.torproject.org.
morgan pushed to branch tor-browser-128.4.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits:
facc9a28 by Henry Wilkes at 2024-11-13T20:06:19+00:00
fixup! Bug 41600: Add a tor circuit display panel.
Bug 43237: Tweak Tor circuit display panel for screen readers.
- - - - -
3 changed files:
- browser/components/torcircuit/content/torCircuitPanel.css
- browser/components/torcircuit/content/torCircuitPanel.inc.xhtml
- browser/components/torcircuit/content/torCircuitPanel.js
Changes:
=====================================
browser/components/torcircuit/content/torCircuitPanel.css
=====================================
@@ -182,6 +182,6 @@
margin: 0;
}
-.tor-circuit-button label.tor-circuit-button-description {
+.tor-circuit-button .tor-circuit-button-description {
margin-block-start: var(--space-xsmall);
}
=====================================
browser/components/torcircuit/content/torCircuitPanel.inc.xhtml
=====================================
@@ -3,18 +3,20 @@
aria-labelledby="tor-circuit-heading"
type="arrow"
orient="vertical"
- class="cui-widget-panel panel-no-padding"
- tabindex="0">
+ class="cui-widget-panel panel-no-padding">
<!-- Use same semantic structure as #identity-popup and #protections-popup
- with a role="alertdialog" wrapping a role="document", except we use a
- "dialog" rather than an "alertdialog".
- Moreover, since this "dialog" may just be for reading, we also make the
- - "dialog" part of the focus cycle and receive the initial focus, rather
+ - "document" part of the focus cycle and receive the initial focus, rather
- than finding the first focusable target within.
- We do not set "aria-describedby" for this "dialog" because the content
- is complex, so a flat string would not make sense. -->
- <vbox id="tor-circuit-panel-document"
- role="document">
+ <!-- NOTE: Currently Orca fails to read the content of this panel, so the
+ - circuit details are not accessible. This effects mozilla-central as well.
+ - See bugzilla bug 1820765 and bugzilla bug 1926374.
+ - The focusable elements are still operable though. -->
+ <vbox id="tor-circuit-panel-document" role="document" tabindex="0">
<vbox class="panel-header">
<html:h1 id="tor-circuit-heading"></html:h1>
<html:div id="tor-circuit-alias" hidden="hidden">
@@ -75,10 +77,12 @@
class="toolbarbutton-text"
data-l10n-id="tor-circuit-panel-new-button"
/>
- <label
+ <!-- NOTE: Use html:span rather than xul:label. Otherwise Orca will
+ - treat this as a label for the dialog. -->
+ <html:span
id="tor-circuit-new-circuit-description"
class="tor-circuit-button-description"
- />
+ ></html:span>
</vbox>
</toolbarbutton>
</vbox>
=====================================
browser/components/torcircuit/content/torCircuitPanel.js
=====================================
@@ -61,6 +61,7 @@ var gTorCircuitPanel = {
this.panel = document.getElementById("tor-circuit-panel");
this._panelElements = {
+ doc: document.getElementById("tor-circuit-panel-document"),
heading: document.getElementById("tor-circuit-heading"),
alias: document.getElementById("tor-circuit-alias"),
aliasLabel: document.getElementById("tor-circuit-alias-label"),
@@ -138,13 +139,18 @@ var gTorCircuitPanel = {
this._updateCircuitPanel();
});
- // Set the initial focus to the panel element itself, which has been made a
- // focusable target. Similar to dialogs, or webextension-popup-browser.
+ // Set the initial focus to the panel document itself, which has been made a
+ // focusable target. Similar to webextension-popup-browser.
+ // Switching to a document should prompt screen readers to enter "browse
+ // mode" and allow the user to navigate the dialog content.
+ // NOTE: We could set the focus to the first focusable child within the
+ // document, but this would usually be the "New circuit" button, which would
+ // skip over the rest of the document content.
this.panel.addEventListener("popupshown", event => {
if (event.target !== this.panel) {
return;
}
- this.panel.focus();
+ this._panelElements.doc.focus();
});
// this.toolbarButton follows "identity-button" markup, so is a <xul:box>
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/facc9a2…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/facc9a2…
You're receiving this email because of your account on gitlab.torproject.org.