Claire 221580a3af Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/home_controller.rb`: Upstream made it so `/web` is available to non-logged-in users and `/` redirects to `/web` instead of `/about`. Kept our version since glitch-soc's WebUI doesn't have what's needed yet and I think /about is still a much better landing page anyway. - `app/models/form/admin_settings.rb`: Upstream added new settings, and glitch-soc had an extra setting. Not really a conflict. Added upstream's new settings. - `app/serializers/initial_state_serializer.rb`: Upstream added a new `server` initial state object. Not really a conflict. Merged upstream's changes. - `app/views/admin/settings/edit.html.haml`: Upstream added new settings. Not really a conflict. Merged upstream's changes. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Upstream refactored that part and removed the file. Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb` - `config/settings.yml`: Upstream added new settings. Not a real conflict. Added upstream's new settings.		2022-10-02 18:46:22 +02: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 existing username validator not allowing multiple accounts (#16153)	2021-05-04 14:22:04 +02:00
follow_limit_validator.rb
html_validator.rb	Optimize some regex matching (#15528)	2021-01-22 10:09:08 +01:00
import_validator.rb	Remove language detection through cld3 (#17478)	2022-02-08 02:41:17 +01: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	Fix URL scanning in note length validator and preview card fetching (#15827)	2021-03-04 00:12:26 +01:00
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