Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 08:48:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2024-08-31 16:06:04 +02:00
parent d46bf54925 02633d6ebb
commit 6f35e93f72
70 changed files with 924 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/serializers/rest/instance_serializer.rb
View File

@@ -78,7 +78,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
},
media_attachments: {
supported_mime_types: MediaAttachment::IMAGE_MIME_TYPES + MediaAttachment::VIDEO_MIME_TYPES + MediaAttachment::AUDIO_MIME_TYPES,
supported_mime_types: MediaAttachment.supported_mime_types,
image_size_limit: MediaAttachment::IMAGE_LIMIT,
image_matrix_limit: Attachmentable::MAX_MATRIX_LIMIT,
video_size_limit: MediaAttachment::VIDEO_LIMIT,