mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-01-07 04:57:02 +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. |
||
|---|---|---|
| .. | ||
| about | ||
| accounts | ||
| admin | ||
| admin_mailer | ||
| application | ||
| auth | ||
| authorize_interactions | ||
| directories | ||
| errors | ||
| filters | ||
| follower_accounts | ||
| following_accounts | ||
| home | ||
| invites | ||
| kaminari | ||
| layouts | ||
| media | ||
| notification_mailer | ||
| oauth | ||
| public_timelines | ||
| relationships | ||
| remote_follow | ||
| remote_interaction | ||
| settings | ||
| shared | ||
| shares | ||
| statuses | ||
| tags | ||
| user_mailer | ||
| well_known/host_meta | ||