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
..
base_controller.rb	Fix suspended users being able to access APIs that don't require a user (#18524)	2022-05-26 22:04:05 +02:00
claims_controller.rb	Refactor ActivityPub handling to prepare for non-Account actors (#19212)	2022-09-21 22:45:57 +02:00
collections_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-02 18:46:22 +02:00
followers_synchronizations_controller.rb	Refactor ActivityPub handling to prepare for non-Account actors (#19212)	2022-09-21 22:45:57 +02:00
inboxes_controller.rb	Refactor ActivityPub handling to prepare for non-Account actors (#19212)	2022-09-21 22:45:57 +02:00
outboxes_controller.rb	Refactor ActivityPub handling to prepare for non-Account actors (#19212)	2022-09-21 22:45:57 +02:00
replies_controller.rb	Refactor ActivityPub handling to prepare for non-Account actors (#19212)	2022-09-21 22:45:57 +02:00