GitLab

at 2025-12-03T09:16:51-03:00

fixup! BB 43140: Tighten up fonts on Linux.

BB 44315: Fix the fonts on the updater.

fixup! BB 43525: Skip Remote Settings for search engine customization.

MB 483: Ship DDG without AI as a bundled search engine.

MB 487: Use custom order for search engines.

fixup! Tweaks to the build system

Skip downloading WPT artifacts when generating test artifacts.

fixup! BB 43615: Add Gitlab Issue and Merge Request templates

Update GitLab templates.

Avoid mentioning existing issues/MRs, and update the channels.

fixup! BB 31575: Disable Firefox Home (Activity Stream)

BB 44302: Add URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS to some about pages.

fixup! BB 42728: Modify ./mach lint to skip unused linters

fixup! Tweaks to the build system

TB 44370: Always create target.maven.zip on Android.

fixup! BB 40925: Implemented the Security Level component

TB 44365: Fix CSS linting errors and missing variables.

fixup! BB 32308: Use direct browser sizing for letterboxing.

TB 44365: Fix CSS linting errors and missing variables.

fixup! Tweaks to the build system

Fix linter issues. Related to using things that are not being imported
since we commented them out. Guess the linter doesnt care that the code
is unreacheable.

fixup! BB 43564: Modify ./mach bootstrap for Base Browser

BB 44400: Disable liquid app glass icons for MacOS

This reverts commit 7ee252421988d7b3a38dc650986a3b4c3321a823.

fixup! BB 42728: Modify ./mach lint to skip unused linters

fixup! Add CI for Base Browser

Filed a review ticket https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/44402

Turned a linter rule back to warning for now.

 ### Proposal

 <!-- Add links to associated proposal issues (or delete block) -->

-- tor-browser#12345

+- tor-browser#xxxxx

 ### Design

 <!-- Add links to associated design issues (or delete block) -->

-- tpo/UX/Design#123

+- tpo/UX/Design#xyz

 <!-- Do not edit beneath this line <3 -->

 ## Bookkeeping

 ### Issue(s)

-- tor-browser#12345

-- mullvad-browser#123

-- https://bugzilla.mozilla.org/show_bug.cgi?id=1234567

+- tor-browser#xxxxx

+- mullvad-browser#xyz

+- https://bugzilla.mozilla.org/show_bug.cgi?id=xxxxxxx

 ### Merge Request(s)

-- tor-browser!123

+- tor-browser!xxxx

 ### Target Channels

 #### Target Channels

-- [ ] **Alpha**: esr140-15.0

-- [ ] **Stable**: esr128-14.5

+- [ ] **Alpha**: rapid release, 16.0

+- [ ] **Stable**: esr140-15.0

 - [ ] **Legacy**: esr115-13.5

 ### Backporting

 	rsync -aL $(DIST)/bin/$(MOZ_APP_NAME) '$(dist_dest)/Contents/MacOS'

 	cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/firefox.icns '$(dist_dest)/Contents/Resources/firefox.icns'

 	cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/document.icns '$(dist_dest)/Contents/Resources/document.icns'

-	cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/Assets.car '$(dist_dest)/Contents/Resources/Assets.car'

 ifndef BASE_BROWSER_UPDATE

 	$(MKDIR) -p '$(dist_dest)/Contents/Library/LaunchServices'

 ifdef MOZ_UPDATER

 	<string>@MAC_APP_NAME@ @APP_VERSION@</string>

 	<key>CFBundleIconFile</key>

 	<string>firefox.icns</string>

-	<key>CFBundleIconName</key>

-	<string>AppIcon</string>

 	<key>CFBundleIdentifier</key>

 	<string>@MOZ_MACBUNDLE_ID@</string>

 	<key>CFBundleInfoDictionaryVersion</key>

 static const uint32_t BASE_BROWSER_HOME_PAGE_FLAGS =

     nsIAboutModule::URI_MUST_LOAD_IN_CHILD |

+    nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |

     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI;

 }

 #securityLevel-level {

-  font-size: 1.25em;

+  font-size: larger;

   font-weight: var(--font-weight-bold);

   grid-area: title;

 }

 .security-level-name {

   grid-area: name;

-  font-weight: bold;

+  font-weight: var(--font-weight-bold);

   align-self: center;

   white-space: nowrap;

 }

 #security-level-current {

   margin-block-start: var(--space-large);

   background: var(--background-color-box);

-  border: 1px solid var(--in-content-box-border-color);

+  border: 1px solid var(--border-color);

   border-radius: var(--border-radius-small);

   padding: var(--space-medium);

 }

 @APPNAME@/Contents/PkgInfo

 @RESPATH@/firefox.icns

 @RESPATH@/document.icns

-@RESPATH@/Assets.car

 @RESPATH@/@LPROJ_ROOT@.lproj/*

 #endif

     nargs=1,

     default=None,

     help="Path to location of fonts directory.",

+    when=is_desktop_build,

 )

     mozbuild_state_path,

     bootstrap_path(

         "fonts",

-        when=depends("--with-tor-browser-fonts")(lambda x: not x) & is_desktop_build,

+        when=depends("--with-tor-browser-fonts", when=is_desktop_build)(

+            lambda x: not x

+        ),

     ),

+    when=is_desktop_build,

 )

 @checking("for tor-browser fonts directory")

 @imports(_from="pathlib", _import="Path")

     ignores: ["toolkit/**/test/**", "toolkit/**/tests/**"],

     plugins: { mozilla },

     rules: {

-      "mozilla/no-browser-refs-in-toolkit": "error",

+      "mozilla/no-browser-refs-in-toolkit": "warn",

     },

   },

   {

     if ret != 0:

         return ret

-    if "MOZ_AUTOMATION" in os.environ:

-        create_maven_archive(command_context.topobjdir)

+    create_maven_archive(command_context.topobjdir)

     return 0

     """Reports errors using Sentry."""

     def report_exception(self, exception):

-        return sentry_sdk.capture_exception(exception)

+        pass

+        # return sentry_sdk.capture_exception(exception)

 class NoopErrorReporter(ErrorReporter):

     )

     _is_unmodified_mach_core_thread.start()

-    sentry_sdk.init(

-        _SENTRY_DSN, before_send=lambda event, _: _process_event(event, topsrcdir)

-    )

-    sentry_sdk.add_breadcrumb(message="./mach {}".format(" ".join(argv)))

+    # sentry_sdk.init(

+    #     _SENTRY_DSN, before_send=lambda event, _: _process_event(event, topsrcdir)

+    # )

+    # sentry_sdk.add_breadcrumb(message="./mach {}".format(" ".join(argv)))

     return SentryErrorReporter()

 import os

 import subprocess

 import sys

-import urllib.parse as urllib_parse

 from pathlib import Path

 from textwrap import dedent

 def resolve_is_employee_by_credentials(topsrcdir: Path):

     return None

-    try:

-        phabricator_uri = resolve_setting_from_arcconfig(topsrcdir, "phabricator.uri")

-

-        if not phabricator_uri:

-            return None

-

-        with arcrc_path().open() as arcrc_file:

-            arcrc = json.load(arcrc_file)

-

-        phabricator_token = (

-            arcrc.get("hosts", {})

-            .get(urllib_parse.urljoin(phabricator_uri, "api/"), {})

-            .get("token")

-        )

-

-        if not phabricator_token:

-            return None

-

-        bmo_uri = (

-            resolve_setting_from_arcconfig(topsrcdir, "bmo_url")

-            or "https://bugzilla.mozilla.org"

-        )

-        bmo_api_url = urllib_parse.urljoin(bmo_uri, "rest/whoami")

-        bmo_result = requests.get(

-            bmo_api_url, headers={"X-PHABRICATOR-TOKEN": phabricator_token}

-        )

-

-        return "mozilla-employee-confidential" in bmo_result.json().get("groups", [])

-    except (

-        FileNotFoundError,

-        json.JSONDecodeError,

-        requests.exceptions.RequestException,

-    ):

-        return None

 def resolve_is_employee_by_vcs(topsrcdir: Path):

 # Below is a list of linters we do not use,

 # these will be skipped when running `./mach lint` commands.

 INACTIVE_LINTERS = [

+    "android-ac",

     "android-api-lint",

     "android-checkstyle",

+    "android-fenix",

+    "android-focus",

     "android-format",

     "android-javadoc",

     "android-lint",

     "rejected-words",

     "rst",

     "updatebot",

+    "typescript",

     "wpt",

+    "stylelint",

+    "glean-parser",

 ]

 	$(call py_action,download_wpt_manifest)

 define package_archive

-package-tests-$(1): stage-all package-tests-prepare-dest download-wpt-manifest

+package-tests-$(1): stage-all package-tests-prepare-dest

 	$$(call py_action,test_archive, \

 		$(1) \

 		'$$(abspath $$(test_archive_dir))/$$(PKG_BASENAME).$(1).tests.$(2)')

   }

 }

+/* stylelint-disable stylelint-plugin-mozilla/use-border-color-tokens */

+/* stylelint-disable stylelint-plugin-mozilla/use-border-radius-tokens */

+

 #tabbrowser-tabbox.letterboxing {

   --letterboxing-bgcolor: var(--background-color-canvas);

   /* Match the border radius used for the sidebar. */

   "ddg": [

     { "url": "chrome://global/content/search/duckduckgo.ico", "imageSize": 32 }

   ],

+  "ddg-noai": [

+    { "url": "chrome://global/content/search/duckduckgo.ico", "imageSize": 32 }

+  ],

   "startpage": [

     {

       "url": "chrome://global/content/search/startpage-16.png",

     "recordType": "engine",

     "variants": [{ "environment": { "allRegionsAndLocales": true } }]

   },

+  {

+    "base": {

+      "aliases": ["ddgnoai"],

+      "classification": "general",

+      "name": "DuckDuckGo (no AI)",

+      "urls": {

+        "search": {

+          "base": "https://noai.duckduckgo.com/",

+          "params": [],

+          "searchTermParamName": "q"

+        }

+      }

+    },

+    "id": "91687f02-56dd-4fef-ba26-bf139dff3166",

+    "identifier": "ddg-noai",

+    "recordType": "engine",

+    "variants": [{ "environment": { "allRegionsAndLocales": true } }]

+  },

   {

     "base": {

       "aliases": ["startpage", "sp"],

     "recordType": "defaultEngines",

     "globalDefault": "ddg",

     "globalDefaultPrivate": "ddg"

+  },

+  {

+    "recordType": "engineOrders",

+    "orders": [

+      {

+        "environment": { "allRegionsAndLocales": true },

+        "order": ["ddg", "ddg-noai", "startpage"]

+      }

+    ]

   }

 ]
 /**

  * This tests the SearchService to check our override of the remote settings is

  * working as expected.

+ *

+ * When adding new engines, it should be enough to change expectedURLs below.

  */

 "use strict";

 const expectedURLs = {

   ddg: "https://duckduckgo.com/?q=test",

+  "ddg-noai": "https://noai.duckduckgo.com/?q=test",

   startpage: "https://www.startpage.com/sp/search?q=test",

 };

 const defaultEngine = "ddg";

     Assert.equal(foundUrl, url, `The URL of ${engine.name} is not altered.`);

   }

 });

+

+add_task(async function test_iconsDoesNotFail() {

+  for (const id of Object.keys(expectedURLs)) {

+    const engine = Services.search.getEngineById(id);

+    // No need to assert anything, as in case of error this method should throw.

+    await engine.getIconURL();

+  }

+});
   putenv(const_cast<char*>("MOZ_USING_SERVICE="));

 #endif

+#if defined(XP_UNIX) && !defined(XP_MACOSX)

+  unsetenv("FONTCONFIG_PATH");

+#endif

+

   if (argc == 2 && NS_tstrcmp(argv[1], NS_T("--channels-allowed")) == 0) {

 #ifdef MOZ_VERIFY_MAR_SIGNATURE

     int rv = PopulategMARStrings();

brizental pushed to branch mullvad-browser-146.0a1-16.0-1 at The Tor Project / Applications / Mullvad Browser

Deleted commits:

25 changed files:

Changes:

...	...	@@ -59,7 +59,7 @@
59	59	}
60	60
61	61	#securityLevel-level {
62		- font-size: 1.25em;
	62	+ font-size: larger;
63	63	font-weight: var(--font-weight-bold);
64	64	grid-area: title;
65	65	}

...	...	@@ -17,6 +17,9 @@
17	17	}
18	18	}
19	19
	20	+/* stylelint-disable stylelint-plugin-mozilla/use-border-color-tokens */
	21	+/* stylelint-disable stylelint-plugin-mozilla/use-border-radius-tokens */
	22	+
20	23	#tabbrowser-tabbox.letterboxing {
21	24	--letterboxing-bgcolor: var(--background-color-canvas);
22	25	/* Match the border radius used for the sidebar. */