Claire be493b6c0d Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly.		2022-02-26 09:29:23 +01:00
..
blacklisted_email_validator_spec.rb	Change e-mail domain blocks to block IPs dynamically (#17635)	2022-02-24 17:28:23 +01:00
disallowed_hashtags_validator_spec.rb
email_mx_validator_spec.rb	Change e-mail domain blocks to block IPs dynamically (#17635)	2022-02-24 17:28:23 +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
unreserved_username_validator_spec.rb	Fix various typos (#17621)	2022-02-22 20:14:17 +01:00
url_validator_spec.rb	Prepare Mastodon for zeitwerk autoloader (#15917)	2021-03-19 02:42:43 +01:00