Claire 2d4b4b0b45 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream introduced support for private pinned toots, but glitch-soc's query was a bit different as it filtered out local-only toots. Used upstream's query, while adding local-only filtering back. - `app/controllers/activitypub/collections_controller.rb`: Same thing with regards to local-only posts. - `app/validators/status_pin_validator.rb`: Not a real conflict, but the line below was different in glitch-soc due to the configurable pinned toots limit.		2022-01-17 08:28:52 +01:00
..
blacklisted_email_validator.rb	Add canonical e-mail blocks for suspended accounts (#16049)	2021-04-17 03:14:25 +02:00
disallowed_hashtags_validator.rb	Change admin UI for hashtags and add back whitelisted trends (#11490)	2019-08-05 19:54:29 +02:00
domain_validator.rb	Fix uncaught domain normalization error in remote follow (#11703)	2019-08-30 02:19:17 +02:00
ed25519_key_validator.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
ed25519_signature_validator.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
email_mx_validator.rb	Bypass MX validation for explicitly allowed domains (#15930)	2021-03-19 23:48:47 +01:00
existing_username_validator.rb	Fix existing username validator not allowing multiple accounts (#16153)	2021-05-04 14:22:04 +02:00
follow_limit_validator.rb	Fix follow limit validator reporting lower number past threshold (#9230)	2018-11-08 21:06:01 +01:00
html_validator.rb	Optimize some regex matching (#15528)	2021-01-22 10:09:08 +01:00
import_validator.rb	Fix follow limit preventing re-following of a moved account (#14207)	2020-12-18 09:18:31 +01:00
note_length_validator.rb	Fix URL scanning in note length validator and preview card fetching (#15827)	2021-03-04 00:12:26 +01:00
poll_validator.rb	Support customizing poll option limits	2021-01-26 14:07:31 +01:00
reaction_validator.rb	Minor memory optimizations (#16507)	2021-10-14 21:04:57 +02:00
registration_form_time_validator.rb	Add honeypot fields and minimum fill-out time for sign-up form (#15276)	2020-12-10 06:27:26 +01:00
status_length_validator.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-11 21:41:23 +02:00
status_pin_validator.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 08:28:52 +01:00
unique_username_validator.rb	Add `details` to error response for `POST /api/v1/accounts` in REST API (#15803)	2021-03-01 04:59:13 +01:00
unreserved_username_validator.rb	Add `details` to error response for `POST /api/v1/accounts` in REST API (#15803)	2021-03-01 04:59:13 +01:00
url_validator.rb	Prepare Mastodon for zeitwerk autoloader (#15917)	2021-03-19 02:42:43 +01:00
vote_validator.rb	Fix invalid votes from the API being accepted (#12601)	2020-01-12 14:17:03 +01:00