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
..
credentials_controller.rb
familiar_followers_controller.rb	Add /api/v1/accounts/familiar_followers to REST API (#17700)	2022-03-07 09:36:47 +01:00
featured_tags_controller.rb
follower_accounts_controller.rb	Change following and followers API to be accessible without being logged in (#18964)	2022-08-28 03:45:07 +02:00
following_accounts_controller.rb	Change following and followers API to be accessible without being logged in (#18964)	2022-08-28 03:45:07 +02:00
identity_proofs_controller.rb
lists_controller.rb
lookup_controller.rb	Fix error when looking handle with surrounding spaces (#18225)	2022-05-02 01:00:08 +02:00
notes_controller.rb
pins_controller.rb
relationships_controller.rb
search_controller.rb
statuses_controller.rb	Fix performance of account timelines (#17709)	2022-03-08 09:14:39 +01:00