gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge commit '34225d7199' into kb_migration

Browse source
This commit is contained in:
KMY 2023-03-27 14:06:56 +09:00
commit 76340285d6
168 changed files with 965 additions and 611 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/features/status/components/action_bar.jsx
View file

@ -48,8 +48,6 @@ const mapStateToProps = (state, { status }) => ({
relationship: state.getIn(['relationships', status.getIn(['account', 'id'])]),
});
export default @connect(mapStateToProps)
@injectIntl
class ActionBar extends React.PureComponent {
static contextTypes = {
@ -311,3 +309,5 @@ class ActionBar extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(ActionBar));

3
app/javascript/mastodon/features/status/components/detailed_status.jsx
View file

@ -27,7 +27,6 @@ const messages = defineMessages({
direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
});
export default @injectIntl
class DetailedStatus extends ImmutablePureComponent {
static contextTypes = {
@ -321,3 +320,5 @@ class DetailedStatus extends ImmutablePureComponent {
}
}
export default injectIntl(DetailedStatus);