Claire eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change.		2022-10-30 18:15:28 +01:00
..
admin_import_validator.rb	Allow import/export of instance-level domain blocks/allows (#1754)	2022-05-16 09:29:01 +02:00
blacklisted_email_validator.rb	Change e-mail domain blocks to block IPs dynamically (#17635)	2022-02-24 17:28:23 +01:00
disallowed_hashtags_validator.rb
domain_validator.rb
ed25519_key_validator.rb
ed25519_signature_validator.rb
email_mx_validator.rb	Remove IP matching from e-mail domain blocks (#18190)	2022-04-29 23:27:03 +02:00
existing_username_validator.rb	Fix remote account in contact account setting not being used (#19351)	2022-10-21 14:07:02 +02:00
follow_limit_validator.rb
html_validator.rb
import_validator.rb	Fix error when uploading malformed CSV import (#19509)	2022-10-28 23:30:44 +02:00
language_validator.rb	Add ability to filter followed accounts' posts by language (#19095)	2022-09-20 23:51:21 +02:00
note_length_validator.rb
poll_validator.rb
reaction_validator.rb	Minor memory optimizations (#16507)	2021-10-14 21:04:57 +02:00
registration_form_time_validator.rb
status_length_validator.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-30 15:02:56 +02:00
status_pin_validator.rb	Various code cleanup (#1782)	2022-05-25 12:27:11 +02:00
unique_username_validator.rb
unreserved_username_validator.rb
url_validator.rb	Add administrative webhooks (#18510)	2022-06-09 21:57:36 +02:00
vote_validator.rb