Skip to content

Commit 74e70b7

Browse files
committed
Merge remote-tracking branch 'upstream/main' into locale-cleanup
2 parents f57d864 + 6e8762f commit 74e70b7

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

services/webhook/payloader.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,12 @@ func newJSONRequest[T any](pc payloadConvertor[T], w *webhook_model.Webhook, t *
9494
return nil, nil, err
9595
}
9696

97-
req, err := http.NewRequest(w.HTTPMethod, w.URL, bytes.NewReader(body))
97+
method := w.HTTPMethod
98+
if method == "" {
99+
method = http.MethodPost
100+
}
101+
102+
req, err := http.NewRequest(method, w.URL, bytes.NewReader(body))
98103
if err != nil {
99104
return nil, nil, err
100105
}

web_src/js/bootstrap.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,18 @@
66
// This file must be imported before any lazy-loading is being attempted.
77
__webpack_public_path__ = `${window.config?.assetUrlPrefix ?? '/assets'}/`;
88

9+
const filteredErrors = new Set([
10+
'getModifierState is not a function', // https://github.com/microsoft/monaco-editor/issues/4325
11+
]);
12+
913
export function showGlobalErrorMessage(msg) {
1014
const pageContent = document.querySelector('.page-content');
1115
if (!pageContent) return;
1216

17+
for (const filteredError of filteredErrors) {
18+
if (msg.includes(filteredError)) return;
19+
}
20+
1321
// compact the message to a data attribute to avoid too many duplicated messages
1422
const msgCompact = msg.replace(/\W/g, '').trim();
1523
let msgDiv = pageContent.querySelector(`.js-global-error[data-global-error-msg-compact="${msgCompact}"]`);

0 commit comments

Comments
 (0)