Merge commit '8099ba04be' into kb_migration

2023-04-25 17:08:32 +09:00 · 2023-04-25 17:08:32 +09:00 · 70ea37a4cc
commit 70ea37a4cc
parent 91adb3047f 8099ba04be
302 changed files with 4018 additions and 2611 deletions
--- a/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
+++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.jsx
@ -10,6 +10,7 @@ import {
  pinAccount,
  unpinAccount,
 } from '../../../actions/accounts';
+import { openURL } from 'mastodon/actions/search';
 import {
  mentionCompose,
  directCompose,
@ -165,6 +166,10 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
    }));
  },

+  onOpenURL (url, routerHistory, onFailure) {
+    dispatch(openURL(url, routerHistory, onFailure));
+  },
+
 });

 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Header));