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
..
access_token_tracking_concern.rb
account_controller_concern.rb
account_owned_concern.rb
accountable_concern.rb
admin_export_controller_concern.rb
authorization.rb
cache_concern.rb	Fix cache_collection crashing when given an empty collection (#15921)	2021-03-18 00:41:32 +01:00
captcha_concern.rb
challengable_concern.rb
export_controller_concern.rb
localized.rb
rate_limit_headers.rb
registration_spam_concern.rb
session_tracking_concern.rb
signature_authentication.rb
signature_verification.rb	Refactor ActivityPub handling to prepare for non-Account actors (#19212)	2022-09-21 22:45:57 +02:00
status_controller_concern.rb
theming_concern.rb
two_factor_authentication_concern.rb
user_tracking_concern.rb