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_spec.rb	Add canonical e-mail blocks for suspended accounts (#16049)	2021-04-17 03:14:25 +02:00
disallowed_hashtags_validator_spec.rb
email_mx_validator_spec.rb	Bypass MX validation for explicitly allowed domains (#15930)	2021-03-19 23:48:47 +01:00
follow_limit_validator_spec.rb
note_length_validator_spec.rb	Fix URL scanning in note length validator and preview card fetching (#15827)	2021-03-04 00:12:26 +01:00
poll_validator_spec.rb
reaction_validator_spec.rb
status_length_validator_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-02 12:06:58 +01:00
status_pin_validator_spec.rb	Add support for private pinned posts (#16954)	2022-01-17 00:49:55 +01:00
unique_username_validator_spec.rb	Search account domain in lowercase (#13016)	2020-02-01 15:42:24 +01:00
unreserved_username_validator_spec.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_spec.rb	Prepare Mastodon for zeitwerk autoloader (#15917)	2021-03-19 02:42:43 +01:00