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
..
exports	Add ability to filter followed accounts' posts by language (#19095)	2022-09-20 23:51:21 +02:00
preferences	Remove unused filtered_languages column (#18533)	2022-05-27 20:05:22 +02:00
two_factor_authentication	Fix typo in source setted->set (#18385)	2022-05-10 04:58:04 +02:00
applications_controller_spec.rb
deletes_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
exports_controller_spec.rb
featured_tags_controller_spec.rb
flavours_controller_spec.rb
imports_controller_spec.rb
migrations_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
profiles_controller_spec.rb	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
sessions_controller_spec.rb
two_factor_authentication_methods_controller_spec.rb