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
..
accept_spec.rb
add_spec.rb
announce_spec.rb	Refactor ActivityPub handling to prepare for non-Account actors (#19212)	2022-09-21 22:45:57 +02:00
block_spec.rb
create_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-27 08:48:21 +02:00
delete_spec.rb
flag_spec.rb	Fix crash when a remote Flag activity mentions a private post (#18760)	2022-07-04 11:08:30 +02:00
follow_spec.rb
like_spec.rb
move_spec.rb	Fix single Redis connection being used across all threads (#18135)	2022-04-28 17:47:34 +02:00
reject_spec.rb
remove_spec.rb
undo_spec.rb
update_spec.rb	Fix poll updates being saved as status edits (#17373)	2022-01-26 18:05:39 +01:00