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

2025-03-10 19:58:05 +09:00 · 2025-03-10 19:58:05 +09:00 · 5979c0ea1d
commit 5979c0ea1d
parent 69d5383d1f 207029eb2f
345 changed files with 4304 additions and 2540 deletions
--- a/app/javascript/mastodon/features/ui/components/embed_modal.tsx
+++ b/app/javascript/mastodon/features/ui/components/embed_modal.tsx
@ -101,6 +101,7 @@ const EmbedModal: React.FC<{
          />

          <iframe
+            // eslint-disable-next-line @typescript-eslint/no-deprecated
            frameBorder='0'
            ref={iframeRef}
            sandbox='allow-scripts allow-same-origin'