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

2024-01-03 19:15:01 +09:00 · 2024-01-03 19:15:01 +09:00 · 7356f776f2
commit 7356f776f2
parent 41631fe46d 7cce2a41f2
60 changed files with 1349 additions and 323 deletions
--- a/app/javascript/mastodon/features/report/components/status_check_box.jsx
+++ b/app/javascript/mastodon/features/report/components/status_check_box.jsx
@ -47,7 +47,7 @@ class StatusCheckBox extends PureComponent {
        </div>

        <StatusContent status={status} />
-        <MediaAttachments status={status} />
+        <MediaAttachments status={status} visible={false} />
      </div>
    );