BB/TB 43421: Rebase onto 140.0a1
Merge Info
Issues
Resolves
- #43421 (closed)
- mullvad-browser#xxxxx
- tor-browser-build#xxxxx
Related
- tor-browser#xxxxx
- mullvad-browser#xxxxx
- tor-browser-build#xxxxx
Merging
Target Branches
-
tor-browser-!fixupstotor-browser-specific commits, new features, security backports -
base-browserandmullvad-browser-!fixupstobase-browser-specific commits, new features to be shared withmullvad-browser, and security backports-
⚠️ IMPORTANT: Please list thebase-browser-specific commits which need to be cherry-picked to thebase-browserandmullvad-browserbranches 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 (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
-
Security update: patchset contains a security fix (be sure to select the correct item in Timeline) -
Censorship event: patchset enables censorship circumvention -
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 -
Localization: typos and other localization changes that should be also in the release branch -
Other: please explain
Upstream
-
Patchset is a candidate for uplift to Firefox -
Patchset is a backport from Firefox - Bugzilla link:
- Upstream commit:
Issue Tracking
-
Link resolved issues with appropriate Release Prep issue for changelog generation
Review
Request Reviewer
-
Request review from an applications developer depending on modified system: -
NOTE: if the MR modifies multiple areas, please
/ccall the relevant reviewers (since Gitlab only allows 1 reviewer) - accessibility : henry
- android : clairehurst, dan
- build system : boklm
- ci/cd: brizental, henry
- extensions : ma1
- firefox internals (XUL/JS/XPCOM) : jwilde, ma1
- fonts : pierov
- frontend (implementation) : henry
- frontend (review) : donuts, morgan
- localization : henry, pierov
- macOS : clairehurst, dan
- nightly builds : boklm
- rebases/release-prep : brizental, clairehurst, dan, ma1, pierov, morgan
- security : jwilde, ma1
- signing : boklm, morgan
- updater : pierov
- windows : jwilde, morgan
- misc/other : pierov, morgan
-
NOTE: if the MR modifies multiple areas, please
Change Description
How Tested
- BB 42220: Allow for more file types to be forced-inline.
- Upstream refactored in bug 1762868 (1874a384)
- BB 42831: Remove the shopping components.
-
browser/components/DesktopActorRegistry.sys.mjs: upstream removedReviewChecker(bd3958ef), which we used to remove
-
- fixup! BB 42831: Remove the shopping components.
-
browser/base/content/browser-init.js: upstream removed the conditional aroundShoppingSidebarManager.ensureInitialized(). Dropped that call anyway.
-
- BB 42288: Allow language spoofing in status messages.
- I moved the thing to Fluent, so drop this (I'm going to send upstream the patch to fix this)
- Base Browser strings
-
tools/lint/fluent-lint/exclusions.yml: Removed our customization, since we won't use those strings anymore
-
- BB 40925: Implemented the Security Level component
-
toolkit/components/search/SearchEngine.sys.mjs: search code usesmoz-src://rather thanresource://. Update our code to match. - 74a4a0ba (Bug 1966662; check also Bug 1950725)
-
- TB 42247: Android helpers for the TorProvider
-
mobile/shared/modules/geckoview/GeckoViewContent.sys.mjs: a bunch of events have been removed upstream, tentatively removing the linting exception
-
- TB 30237: Add v3 onion services client authentication prompt
-
xpcom/base/ErrorList.py: newDOM_QMmodule, bumping the number of our errors
-
- TB 34378: [android] Port external helper app prompting
-
mobile/android/android-components/components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksFeature.kt: major refactor upstream in 6aa327ec (Bug 1929028)
-
- [android] Rename as Tor Browser
- Lots of conflicts with resources/logos
- [android] Modify build system
-
mobile/android/android-components/plugins/config/src/main/java/ConfigPlugin.kt: upstream removedgenerateBuildDate()in e6af7dc7 (Bug 1960122)
-
- TB 34403 [android]: Disable Normal mode by default.
-
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt: major refactor upstream a09ea6ff (Bug 1965832)
-
- TB 41972: [android] Disable Mozilla onboarding
-
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt: upstream removedshowHomeOnboardingDialogin fd8ad720 (Bug 1966035)
-