Skip to content

Upstream 20251202 #1073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kmycode merged 125 commits into from
Dec 9, 2025

Merge remote-tracking branch 'parent/main' into upstream-20251202

ccdde93
Select commit
Loading
Failed to load commit list.
Merged

Upstream 20251202 #1073

Merge remote-tracking branch 'parent/main' into upstream-20251202
ccdde93
Select commit
Loading
Failed to load commit list.
GitHub Advanced Security / CodeQL succeeded Dec 9, 2025 in 2s

No new alerts in code changed by this pull request

View all branch alerts.

Annotations

Check failure on line 108 in app/javascript/mastodon/actions/importer/normalizer.js

See this annotation in the file changed.

Code scanning / CodeQL

DOM text reinterpreted as HTML High

DOM text
Loading
is reinterpreted as HTML without escaping meta-characters.

Check failure on line 11 in app/javascript/mastodon/utils/html.ts

See this annotation in the file changed.

Code scanning / CodeQL

DOM text reinterpreted as HTML High

DOM text
Loading
is reinterpreted as HTML without escaping meta-characters.