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

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

Browse source
This commit is contained in:
KMY 2023-11-04 09:10:13 +09:00
commit 52dac50826
80 changed files with 875 additions and 707 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/features/ui/components/focal_point_modal.jsx
View file

@ -110,7 +110,7 @@ class FocalPointModal extends ImmutablePureComponent {
static propTypes = {
media: ImmutablePropTypes.map.isRequired,
account: ImmutablePropTypes.map.isRequired,
account: ImmutablePropTypes.record.isRequired,
isUploadingThumbnail: PropTypes.bool,
onSave: PropTypes.func.isRequired,
onChangeDescription: PropTypes.func.isRequired,

2
app/javascript/mastodon/features/ui/components/report_modal.jsx
View file

@ -41,7 +41,7 @@ class ReportModal extends ImmutablePureComponent {
statusId: PropTypes.string,
dispatch: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired,
account: ImmutablePropTypes.map.isRequired,
account: ImmutablePropTypes.record.isRequired,
};
state = {