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 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `yarn.lock`:
  Not a real conflict, just a line adjacent to a glitch-soc only dependency
  getting updated.
  Updated dependencies as upstream did.
This commit is contained in:
Claire
2024-05-29 17:03:24 +02:00
parent 60c2310fd8 d20a5c3ec9
commit c827a98f19
80 changed files with 543 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
statuses: {
max_characters: StatusLengthValidator::MAX_CHARS,
max_media_attachments: 4,
max_media_attachments: Status::MEDIA_ATTACHMENTS_LIMIT,
characters_reserved_per_url: StatusLengthValidator::URL_PLACEHOLDER_CHARS,
supported_mime_types: HtmlAwareFormatter::STATUS_MIME_TYPES,
},