mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-16 11:53:13 +00:00
cdf20f4367
Conflicts: - `app/serializers/rest/instance_serializer.rb`: Upstream changed the fields returned by /api/v1/instance by adding a `configuration` field holding a lot of useful information making our `max_toot_chars` and `poll_limits` fields obsolete. Keeping those around for now for compatibility. - `app/validators/status_length_validator.rb`: No real conflict, just URL_PLACEHOLDER_CHARS introduced too close to MAX_CHARS which is defined differently in glitch-soc. Ported upstream changes. |
||
|---|---|---|
| .. | ||
| admin | ||
| keys | ||
| account_serializer.rb | ||
| announcement_serializer.rb | ||
| application_serializer.rb | ||
| context_serializer.rb | ||
| conversation_serializer.rb | ||
| credential_account_serializer.rb | ||
| custom_emoji_serializer.rb | ||
| encrypted_message_serializer.rb | ||
| featured_tag_serializer.rb | ||
| filter_serializer.rb | ||
| identity_proof_serializer.rb | ||
| instance_serializer.rb | ||
| list_serializer.rb | ||
| marker_serializer.rb | ||
| media_attachment_serializer.rb | ||
| mute_serializer.rb | ||
| muted_account_serializer.rb | ||
| notification_serializer.rb | ||
| poll_serializer.rb | ||
| preferences_serializer.rb | ||
| preview_card_serializer.rb | ||
| reaction_serializer.rb | ||
| relationship_serializer.rb | ||
| report_serializer.rb | ||
| rule_serializer.rb | ||
| scheduled_status_serializer.rb | ||
| search_serializer.rb | ||
| status_serializer.rb | ||
| suggestion_serializer.rb | ||
| tag_serializer.rb | ||
| web_push_subscription_serializer.rb | ||