mirror of
https://codeberg.org/librewolf/source.git
synced 2024-12-22 05:33:03 -05:00
Merge branch '102_requests' into 'main'
update requests patch See merge request librewolf-community/browser/source!37
This commit is contained in:
commit
6f682482c4
1 changed files with 18 additions and 17 deletions
|
@ -1,5 +1,5 @@
|
|||
diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js
|
||||
index 3439547..7127947 100644
|
||||
index 34395476104e..83bc25d7fc62 100644
|
||||
--- a/browser/components/newtab/data/content/activity-stream.bundle.js
|
||||
+++ b/browser/components/newtab/data/content/activity-stream.bundle.js
|
||||
@@ -1577,7 +1577,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent {
|
||||
|
@ -11,20 +11,8 @@ index 3439547..7127947 100644
|
|||
rel: "noopener noreferrer"
|
||||
}, "nimbus-desktop-experiments"), ")");
|
||||
}
|
||||
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
|
||||
index db545cd..05f408c 100644
|
||||
--- a/modules/libpref/init/all.js
|
||||
+++ b/modules/libpref/init/all.js
|
||||
@@ -2055,6 +2055,7 @@ pref("security.insecure_field_warning.ignore_local_ip_address", true);
|
||||
|
||||
// Remote settings preferences
|
||||
pref("services.settings.poll_interval", 86400); // 24H
|
||||
+pref("services.settings.server","https://see.ticket.about.this.invalid"); // LibreWolf override
|
||||
|
||||
// The percentage of clients who will report uptake telemetry as
|
||||
// events instead of just a histogram. This only applies on Release;
|
||||
diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm
|
||||
index 31ad77d..cca446b 100644
|
||||
index 31ad77d28678..cca446b6fbde 100644
|
||||
--- a/services/settings/Utils.jsm
|
||||
+++ b/services/settings/Utils.jsm
|
||||
@@ -60,6 +60,10 @@ XPCOMUtils.defineLazyGetter(this, "isRunningTests", () => {
|
||||
|
@ -39,7 +27,7 @@ index 31ad77d..cca446b 100644
|
|||
// Always allow to override the server URL on Nightly/DevEdition.
|
||||
return true;
|
||||
diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm
|
||||
index 0bf60e5..bcb685e 100644
|
||||
index 0bf60e5f163a..bcb685efe68d 100644
|
||||
--- a/toolkit/components/search/SearchUtils.jsm
|
||||
+++ b/toolkit/components/search/SearchUtils.jsm
|
||||
@@ -158,9 +158,9 @@ var SearchUtils = {
|
||||
|
@ -47,10 +35,23 @@ index 0bf60e5..bcb685e 100644
|
|||
ENGINES_URLS: {
|
||||
"prod-main":
|
||||
- "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-config/records",
|
||||
+ "https://see.ticket.about.this.invalid",
|
||||
+ "https://%.invalid",
|
||||
"prod-preview":
|
||||
- "https://firefox.settings.services.mozilla.com/v1/buckets/main-preview/collections/search-config/records",
|
||||
+ "https://see.ticket.about.this.invalid",
|
||||
+ "https://%.invalid",
|
||||
"stage-main":
|
||||
"https://settings.stage.mozaws.net/v1/buckets/main/collections/search-config/records",
|
||||
"stage-preview":
|
||||
diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm
|
||||
index 7f8ac95dd962..334003b3e005 100644
|
||||
--- a/toolkit/modules/AppConstants.jsm
|
||||
+++ b/toolkit/modules/AppConstants.jsm
|
||||
@@ -422,7 +422,7 @@ this.AppConstants = Object.freeze({
|
||||
#ifdef MOZ_THUNDERBIRD
|
||||
"https://thunderbird-settings.thunderbird.net/v1",
|
||||
#else
|
||||
- "https://firefox.settings.services.mozilla.com/v1",
|
||||
+ "https://%.invalid",
|
||||
#endif
|
||||
|
||||
REMOTE_SETTINGS_VERIFY_SIGNATURE:
|
||||
|
|
Loading…
Reference in a new issue