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
..
account_associations.rb
account_avatar.rb	Add support for webp uploads (#18506)	2022-05-27 20:06:40 +02:00
account_counters.rb
account_finder_concern.rb	Fix instance actor being incorrectly created when running migrations (#18109)	2022-04-26 21:22:09 +02:00
account_header.rb	Add support for webp uploads (#18506)	2022-05-27 20:06:40 +02:00
account_interactions.rb	Add ability to filter followed accounts' posts by language (#19095)	2022-09-20 23:51:21 +02:00
account_merging.rb
attachmentable.rb
cacheable.rb
domain_materializable.rb
domain_normalizable.rb
expireable.rb
follow_limitable.rb
ldap_authenticable.rb
lockable.rb	Refactor how Redis locks are created (#18400)	2022-05-13 00:02:35 +02:00
omniauthable.rb
paginable.rb
pam_authenticable.rb
rate_limitable.rb
redisable.rb	Refactor how Redis locks are created (#18400)	2022-05-13 00:02:35 +02:00
relationship_cacheable.rb
remotable.rb
status_snapshot_concern.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-26 19:18:55 +01:00
status_threading_concern.rb