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.
2020-06-09 10:39:20 +02:00
..
delivery_worker.rb Fix error within error when limiting backtrace to 3 lines (#13120) 2020-05-10 10:30:27 +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 Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
fetch_replies_worker.rb
low_priority_delivery_worker.rb
move_distribution_worker.rb
post_upgrade_worker.rb ActivityPub migration procedure (#4617) 2017-08-21 01:14:40 +02:00
processing_worker.rb Do not retry processing ActivityPub jobs raising validation errors (#10614) 2019-05-03 23:45:37 +02:00
raw_distribution_worker.rb
reply_distribution_worker.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02: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 Refactor all ActivityPub deliveries to be serialized and signed through one concern (#10966) 2019-06-04 23:11:18 +02:00