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
blacklisted_email_validator.rb
disallowed_hashtags_validator.rb
domain_validator.rb
ed25519_key_validator.rb
ed25519_signature_validator.rb
email_mx_validator.rb
existing_username_validator.rb
follow_limit_validator.rb
html_validator.rb
import_validator.rb
language_validator.rb
note_length_validator.rb
poll_validator.rb
reaction_validator.rb
registration_form_time_validator.rb
status_length_validator.rb
status_pin_validator.rb
unique_username_validator.rb
unreserved_username_validator.rb
url_validator.rb
vote_validator.rb