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

This commit is contained in:
KMY 2024-12-06 12:17:45 +09:00
commit 3c3ee557d0
187 changed files with 1105 additions and 537 deletions

View file

@ -81,12 +81,13 @@ class REST::InstanceSerializer < ActiveModel::Serializer
},
media_attachments: {
supported_mime_types: MediaAttachment.supported_mime_types,
image_size_limit: MediaAttachment::IMAGE_LIMIT,
description_limit: MediaAttachment::MAX_DESCRIPTION_LENGTH,
image_matrix_limit: Attachmentable::MAX_MATRIX_LIMIT,
video_size_limit: MediaAttachment::VIDEO_LIMIT,
image_size_limit: MediaAttachment::IMAGE_LIMIT,
supported_mime_types: MediaAttachment.supported_mime_types,
video_frame_rate_limit: MediaAttachment::MAX_VIDEO_FRAME_RATE,
video_matrix_limit: MediaAttachment::MAX_VIDEO_MATRIX_LIMIT,
video_size_limit: MediaAttachment::VIDEO_LIMIT,
},
polls: {