Landings for Stack Containing D240491

Failed to land

Landing requested on , by twisniewski@mozilla.com.

Revisions: D240255 diff 998853 ← D240256 diff 998854 ← D240257 diff 998855 ← D240258 diff 998856 ← D240259 diff 998857 ← D240261 diff 998858 ← D240269 diff 998859 ← D239647 diff 990522 ← D240036 diff 993066 ← D240491 diff 995301

While applying revision D240491 to mozilla-central, the following files had conflicts:

(Hint: try rebasing your changes on the latest commits from mozilla-central and re-submitting.)

browser/extensions/webcompat/data/shims.js @ b99449887d3cfe06f9a2ac0d65c21dcc20d0812a

--- shims.js
+++ shims.js
...

--- shims.js
+++ shims.js
@@ -987,8 +987,21 @@
     bug: "1925995",
     file: "botd.mjs",
     matches: ["*://openfpcdn.io/botd/v1"],
     onlyIfBlockedByETP: true,
   },
+  {
+    id: "AliExpressInternationalization",
+    name: "AliExpress Internationalization",
+    bug: "1912228",
+    contentScripts: [
+      {
+        js: "aliexpress-language.js",
+        matches: ["*://*.aliexpress.us/*"],
+        runAt: "document_start",
+      },
+    ],
+    onlyIfDFPIActive: true,
+  },
 ];
 
 module.exports = AVAILABLE_SHIMS;

Raw error output:
Problem while applying patch in revision 240491:

hg error in cmd: hg import --no-commit -s 95 /tmp/tmpv77iq7yj: applying /tmp/tmpv77iq7yj

patching file browser/extensions/webcompat/data/shims.js
Hunk #1 FAILED at 986
1 out of 1 hunks FAILED -- saving rejects to file browser/extensions/webcompat/data/shims.js.rej
abort: patch failed to apply

Stack containing revision D240491

Land		Bug	Status	Revision	Reviewers
		1728111	Blocked Repository is not supported by Lando. Closed	D240364: Bug 1728111 - Add accounts.microsoft.com icon shim - r=#anti-tracking!,twisniewski!	@anti-tracking-reviewers accepted a prior diff @webcompat-reviewers accepted a prior diff @timhuang accepted a prior diff @bvandersloot accepted a prior diff
		1912228	Blocked Repository is not supported by Lando. Closed	D240491: Bug 1912228 - aliexpress.com - Unable to change the shipping location back to default with Standard ETP - r=#anti-tracking!,twisniewski!	@anti-tracking-reviewers accepted a prior diff @webcompat-reviewers accepted a prior diff @timhuang accepted a prior diff @bvandersloot accepted a prior diff