You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/workers/activitypub
Thibaut Girka 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict due to glitch-soc having to take care of local-only
  pinned toots in that controller.
  Took upstream's changes and restored the local-only special
  handling.
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflicts due to the theming system, applied upstream
  changes, adapted the following two files for glitch-soc's
  theming system:
  - `app/controllers/concerns/sign_in_token_authentication_concern.rb`
  - `app/controllers/concerns/two_factor_authentication_concern.rb`
- `app/services/backup_service.rb`:
  Minor conflict due to glitch-soc having to handle local-only
  toots specially. Applied upstream changes and restored
  the local-only special handling.
- `app/views/admin/custom_emojis/index.html.haml`:
  Minor conflict due to the theming system.
- `package.json`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
- `yarn.lock`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
6 years ago
..
delivery_worker.rb Fix error within error when limiting backtrace to 3 lines (#13120) 6 years ago
distribute_poll_update_worker.rb Merge branch 'master' into glitch-soc/merge-upstream 6 years ago
distribution_worker.rb Add E2EE API (#13820) 6 years ago
fetch_replies_worker.rb Do not error out on unsalvageable errors in FetchRepliesService (#10175) 7 years ago
low_priority_delivery_worker.rb
move_distribution_worker.rb Fixed missing account in MoveDistributionWorker (#11906) 7 years ago
post_upgrade_worker.rb
processing_worker.rb Do not retry processing ActivityPub jobs raising validation errors (#10614) 7 years ago
raw_distribution_worker.rb
reply_distribution_worker.rb Add E2EE API (#13820) 6 years ago
synchronize_featured_collection_worker.rb Fix background jobs not using locks like they are supposed to (#13361) 6 years ago
update_distribution_worker.rb Refactor all ActivityPub deliveries to be serialized and signed through one concern (#10966) 7 years ago