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

2024-11-01 08:04:03 +09:00 · 2024-11-01 08:04:03 +09:00 · 1c1f76697b
commit 1c1f76697b
parent 9c71b791e1 b06fd54c30
200 changed files with 1931 additions and 741 deletions
--- a/app/javascript/mastodon/components/status_content.jsx
+++ b/app/javascript/mastodon/components/status_content.jsx
@ -250,7 +250,7 @@ class StatusContent extends PureComponent {
    );

    const poll = !!status.get('poll') && (
-      <PollContainer pollId={status.get('poll')} lang={language} />
+      <PollContainer pollId={status.get('poll')} status={status} lang={language} />
    );

    if (this.props.onClick) {