Merge remote-tracking branch 'parent/main' into kb_migration

2023-05-23 09:34:55 +09:00 · 2023-05-23 09:34:55 +09:00 · 1daa5d9096
commit 1daa5d9096
parent 9642305755 711a037660
42 changed files with 1235 additions and 255 deletions
--- a/app/javascript/mastodon/features/ui/components/embed_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/embed_modal.jsx
@ -85,7 +85,7 @@ class EmbedModal extends ImmutablePureComponent {
            className='embed-modal__iframe'
            frameBorder='0'
            ref={this.setIframeRef}
-            sandbox='allow-same-origin'
+            sandbox='allow-scripts allow-same-origin'
            title='preview'
          />
        </div>