Merge commit 'fd284311e7' into kb_migration

2023-08-01 17:59:16 +09:00 · 2023-08-01 17:59:16 +09:00 · 287eacf5f3
commit 287eacf5f3
parent f64e5666ba fd284311e7
400 changed files with 4667 additions and 5387 deletions
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@ -297,7 +297,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
      modalProps: {
        type,
        accountId: status.getIn(['account', 'id']),
-        url: status.get('url'),
+        url: status.get('uri'),
      },
    }));
  },