Various Gitlab Template updates

morganrequested to merge
morgan/mullvad-browser:template-tweaks into mullvad-browser-128.9.0esr-14.5-1

Merge Info

Issues

Related

Merging

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 (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)
  • 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

Review

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)
    • accessibility : henry
    • android : clairehurst, dan
    • build system : boklm
    • 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 : dan, ma1, pierov, morgan
    • security : jwilde, ma1
    • signing : boklm, morgan
    • updater : pierov
    • windows : jwilde, morgan
    • misc/other : pierov, morgan

Change Description

Mullvad-Browser counterpart to tor-browser!1477 (merged)

Like the tor-browser version, a bit complicated:

  • 75f63014 // fully reverts the MB template commit
  • 976a2fce // fully reverts the TB template commit
  • The following can be ignored during rebase as they will be come from tor-browser
  • 1daa5b6c // modifies the new templates inherited from tor-browser, mostly label updates and some mullvad-browser specific customisations, and bringing back the mullvad-browser specific rebase template content

How Tested

Verified renders nicely in markdown viewer.

Edited by morgan

Merge request reports