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

This commit is contained in:
KMY 2024-08-30 08:17:34 +09:00
commit 206021455e
25 changed files with 378 additions and 144 deletions

View file

@ -81,7 +81,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,