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

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/report/category.jsx
View file

@ -24,8 +24,6 @@ const mapStateToProps = state => ({
rules: state.getIn(['server', 'server', 'rules'], ImmutableList()),
});
export default @connect(mapStateToProps)
@injectIntl
class Category extends React.PureComponent {
static propTypes = {
@ -104,3 +102,5 @@ class Category extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Category));

3
app/javascript/mastodon/features/report/comment.jsx
View file

@ -8,7 +8,6 @@ const messages = defineMessages({
placeholder: { id: 'report.placeholder', defaultMessage: 'Type or paste additional comments' },
});
export default @injectIntl
class Comment extends React.PureComponent {
static propTypes = {
@ -81,3 +80,5 @@ class Comment extends React.PureComponent {
}
}
export default injectIntl(Comment);

3
app/javascript/mastodon/features/report/components/status_check_box.jsx
View file

@ -18,7 +18,6 @@ const messages = defineMessages({
direct_short: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
});
export default @injectIntl
class StatusCheckBox extends React.PureComponent {
static propTypes = {
@ -82,3 +81,5 @@ class StatusCheckBox extends React.PureComponent {
}
}
export default injectIntl(StatusCheckBox);

3
app/javascript/mastodon/features/report/rules.jsx
View file

@ -10,7 +10,6 @@ const mapStateToProps = state => ({
rules: state.getIn(['server', 'server', 'rules']),
});
export default @connect(mapStateToProps)
class Rules extends React.PureComponent {
static propTypes = {
@ -62,3 +61,5 @@ class Rules extends React.PureComponent {
}
}
export default connect(mapStateToProps)(Rules);

3
app/javascript/mastodon/features/report/statuses.jsx
View file

@ -13,7 +13,6 @@ const mapStateToProps = (state, { accountId }) => ({
isLoading: state.getIn(['timelines', `account:${accountId}:with_replies`, 'isLoading']),
});
export default @connect(mapStateToProps)
class Statuses extends React.PureComponent {
static propTypes = {
@ -59,3 +58,5 @@ class Statuses extends React.PureComponent {
}
}
export default connect(mapStateToProps)(Statuses);

3
app/javascript/mastodon/features/report/thanks.jsx
View file

@ -12,7 +12,6 @@ import {
const mapStateToProps = () => ({});
export default @connect(mapStateToProps)
class Thanks extends React.PureComponent {
static propTypes = {
@ -82,3 +81,5 @@ class Thanks extends React.PureComponent {
}
}
export default connect(mapStateToProps)(Thanks);