masto-fe/app/workers/activitypub
Thibaut Girka ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, we deleted it to not be flooded by Depandabot.
  Kept deleted.
- `Gemfile.lock`:
  Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
  Upstream updated the serializer to support timed mutes, while
  glitch-soc added a custom API ages ago to get information that
  is already available elsewhere.
  Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
  🤷
- `app/models/user.rb`:
  New user setting added upstream while we have glitch-soc-specific
  user settings. Added upstream's user setting.
- `config/settings.yml`:
  Upstream added a new user setting close to a user setting we had
  changed the defaults for. Added the new upstream setting.
- `package.json`:
  Upstream dependency updated “too close” to a glitch-soc-specific
  dependency. No real conflict. Updated the dependency.
2020-10-21 19:10:50 +02:00
..
delivery_worker.rb Add follower synchronization mechanism (#14510) 2020-10-21 18:04:09 +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 follower synchronization mechanism (#14510) 2020-10-21 18:04:09 +02: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 sending account Delete to anyone but the account's followers to the pull̀ queue (#10016) 2019-02-12 05:10:43 +01:00
move_distribution_worker.rb Change move handler to carry blocks over (#14144) 2020-07-01 13:51:15 +02:00
post_upgrade_worker.rb ActivityPub migration procedure (#4617) 2017-08-21 01:14:40 +02:00
processing_worker.rb Changed retries and rescued in ActivityPub::ProcessingWorker (#14355) 2020-07-20 11:26:12 +02:00
raw_distribution_worker.rb Fix too many forwards (#5854) 2017-11-30 03:50:05 +01:00
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