Claire 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.		2022-05-01 16:52:27 +02: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	Remove IP matching from e-mail domain blocks (#18190)	2022-04-29 23:27:03 +02:00
follow_limit_validator_spec.rb
note_length_validator_spec.rb
poll_validator_spec.rb
reaction_validator_spec.rb
status_length_validator_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-30 15:02:56 +02:00
status_pin_validator_spec.rb
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