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

2024-02-09 12:53:59 +09:00 · 2024-02-09 12:53:59 +09:00 · 05e52a09a8
commit 05e52a09a8
parent 57341a82ac ca8fbda5d0
188 changed files with 2810 additions and 1295 deletions
--- a/app/javascript/mastodon/features/compose/components/upload_button.jsx
+++ b/app/javascript/mastodon/features/compose/components/upload_button.jsx
@ -65,6 +65,7 @@ class UploadButton extends ImmutablePureComponent {
            key={resetFileKey}
            ref={this.setRef}
            type='file'
+            name='file-upload-input'
            multiple
            accept={acceptContentTypes.toArray().join(',')}
            onChange={this.handleChange}