mirror of
https://github.com/zen-browser/desktop.git
synced 2026-03-30 20:31:53 +00:00
chore: Sync upstream Firefox to version 147.0, p=#11822
* chore: Sync upstream to `Firefox 147.0` * chore: Continued migration, b=no-bug, c=tests * chore: Finish migration without testing, b=no-bug, c=scripts, tabs, media, common, split-view * feat: Finish migration, b=no-bug, c=common, compact-mode, split-view, workspaces * feat: Finish basic migration, b=no-bug, c=kbs, common, folders * feat: Update surfer, b=no-bug, c=scripts
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git a/testing/mochitest/browser-test.js b/testing/mochitest/browser-test.js
|
||||
index 91bd995c2910fae5a3f67a960d15d90de3c997df..a7157331184e099ee468a719d6ec0f2d766dbed1 100644
|
||||
index a687d271a91207f3e4a7b9afdf67031f8d9385d1..ebbf2e0cbf5e9eeca472c4c2a5963c290be8897d 100644
|
||||
--- a/testing/mochitest/browser-test.js
|
||||
+++ b/testing/mochitest/browser-test.js
|
||||
@@ -442,10 +442,10 @@ Tester.prototype = {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/testing/profiles/mochitest/user.js b/testing/profiles/mochitest/user.js
|
||||
index a4068ac3f61161d014c49d54ae7a3bf886868f1b..b755e8004bc19817c83668603ecf0127000b709f 100644
|
||||
index 782258420cdce901f182897b796731a1fdf69ecf..59b2827a7cd8a8580ba5061cabb36a2ba13240ba 100644
|
||||
--- a/testing/profiles/mochitest/user.js
|
||||
+++ b/testing/profiles/mochitest/user.js
|
||||
@@ -41,3 +41,8 @@ user_pref("places.history.floodingPrevention.enabled", false);
|
||||
@@ -36,3 +36,8 @@ user_pref("places.history.floodingPrevention.enabled", false);
|
||||
// permission, and we can open it and wait for the user to give permission, then
|
||||
// don't do that.
|
||||
user_pref("geo.prompt.open_system_prefs", false);
|
||||
|
||||
Reference in New Issue
Block a user