You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire cdf20f4367 Merge branch 'main' into glitch-soc/merge-upstream ... 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.		3 years ago
..
blacklisted_email_validator.rb	Add canonical e-mail blocks for suspended accounts (#16049)	4 years ago
disallowed_hashtags_validator.rb	Change admin UI for hashtags and add back whitelisted trends (#11490)	5 years ago
domain_validator.rb	Fix uncaught domain normalization error in remote follow (#11703)	5 years ago
ed25519_key_validator.rb	Add E2EE API (#13820)	5 years ago
ed25519_signature_validator.rb	Add E2EE API (#13820)	5 years ago
email_mx_validator.rb	Bypass MX validation for explicitly allowed domains (#15930)	4 years ago
existing_username_validator.rb	Fix existing username validator not allowing multiple accounts (#16153)	4 years ago
follow_limit_validator.rb	Fix follow limit validator reporting lower number past threshold (#9230)	6 years ago
html_validator.rb	Optimize some regex matching (#15528)	4 years ago
import_validator.rb	Fix follow limit preventing re-following of a moved account (#14207)	4 years ago
note_length_validator.rb	Fix URL scanning in note length validator and preview card fetching (#15827)	4 years ago
poll_validator.rb	Support customizing poll option limits	4 years ago
reaction_validator.rb	Fix validations of reactions limit (#12955)	5 years ago
registration_form_time_validator.rb	Add honeypot fields and minimum fill-out time for sign-up form (#15276)	4 years ago
status_length_validator.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
status_pin_validator.rb	changed pinned status count operator	6 years ago
unique_username_validator.rb	Add `details` to error response for `POST /api/v1/accounts` in REST API (#15803)	4 years ago
unreserved_username_validator.rb	Add `details` to error response for `POST /api/v1/accounts` in REST API (#15803)	4 years ago
url_validator.rb	Prepare Mastodon for zeitwerk autoloader (#15917)	4 years ago
vote_validator.rb	Fix invalid votes from the API being accepted (#12601)	5 years ago