mastodon/app/workers/activitypub
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
..
delivery_worker.rb Refactor ActivityPub handling to prepare for non-Account actors (#19212) 2022-09-21 22:45:57 +02:00
distribute_poll_update_worker.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-04-02 20:32:00 +02:00
distribution_worker.rb Fix Sidekiq warnings about JSON serialization (#17381) 2022-01-28 00:43:56 +01:00
fetch_replies_worker.rb Do not error out on unsalvageable errors in FetchRepliesService (#10175) 2019-03-05 15:21:14 +01:00
followers_synchronization_worker.rb Add follower synchronization mechanism (#14510) 2020-10-21 18:04:09 +02:00
low_priority_delivery_worker.rb
move_distribution_worker.rb Change move handler to carry blocks over (#14144) 2020-07-01 13:51:15 +02:00
post_upgrade_worker.rb
processing_worker.rb Refactor ActivityPub handling to prepare for non-Account actors (#19212) 2022-09-21 22:45:57 +02:00
raw_distribution_worker.rb Fix error when using raw distribution worker (#17334) 2022-01-19 23:05:59 +01:00
status_update_distribution_worker.rb Fix NoMethodError in StatusUpdateDistributionWorker (#17499) 2022-02-10 14:57:10 +01:00
synchronize_featured_collection_worker.rb Fix background jobs not using locks like they are supposed to (#13361) 2020-03-31 21:59:03 +02:00
update_distribution_worker.rb Add support for editing for published statuses (#16697) 2022-01-19 22:37:27 +01:00