tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'd20d04922672ed016029c40ed64798f341ebca91' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire committed 2026-05-26 20:48:49 +02:00
2 parents 235637fc5f d20d049226
commit 06176deee2
50 files changed
+710 -112
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/javascript/mastodon/actions/compose.js
+1 -1
View File
@@ -329,7 +329,7 @@ export function uploadCompose(files) {
dispatch(showAlert({ message: messages.uploadQuote }));
return;
}
const uploadLimit = getState().getIn(['server', 'server', 'configuration', 'statuses', 'max_media_attachments']);
const uploadLimit = getState().getIn(['server', 'server', 'item', 'configuration', 'statuses', 'max_media_attachments']);
const media = getState().getIn(['compose', 'media_attachments']);
const pending = getState().getIn(['compose', 'pending_media_attachments']);
const progress = new Array(files.length).fill(0);