mirror of
https://github.com/funamitech/mastodon
synced 2024-12-11 21:29:17 +09: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. |
||
|---|---|---|
| .. | ||
| blacklisted_email_validator.rb | ||
| disallowed_hashtags_validator.rb | ||
| domain_validator.rb | ||
| ed25519_key_validator.rb | ||
| ed25519_signature_validator.rb | ||
| email_mx_validator.rb | ||
| existing_username_validator.rb | ||
| follow_limit_validator.rb | ||
| html_validator.rb | ||
| import_validator.rb | ||
| note_length_validator.rb | ||
| poll_validator.rb | ||
| reaction_validator.rb | ||
| registration_form_time_validator.rb | ||
| status_length_validator.rb | ||
| status_pin_validator.rb | ||
| unique_username_validator.rb | ||
| unreserved_username_validator.rb | ||
| url_validator.rb | ||
| vote_validator.rb | ||