mastodon/app/workers
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
..
activitypub Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
admin
concerns
import Fix performance of follow import (#13836) 2020-06-09 10:26:58 +02:00
scheduler Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
web
after_account_domain_block_worker.rb
authorize_follow_worker.rb authorize-follow-requests-after-unlocking (#4658) 2017-08-26 12:40:03 +02:00
backup_worker.rb Change local media attachments to perform heavy processing asynchronously (#13210) 2020-03-08 23:56:18 +01:00
block_worker.rb
bootstrap_timeline_worker.rb
digest_mailer_worker.rb
distribution_worker.rb
domain_block_worker.rb Make domain block/silence/reject-media code more robust (#13424) 2020-06-09 10:32:00 +02:00
domain_clear_media_worker.rb Make domain block/silence/reject-media code more robust (#13424) 2020-06-09 10:32:00 +02:00
feed_insert_worker.rb
fetch_reply_worker.rb
import_worker.rb
link_crawl_worker.rb
local_notification_worker.rb
merge_worker.rb
move_worker.rb
mute_worker.rb Add conversations API (#8832) 2018-10-07 23:44:58 +02:00
poll_expiration_notify_worker.rb Fix background jobs not using locks like they are supposed to (#13361) 2020-03-31 21:59:03 +02:00
post_process_media_worker.rb Fix trying to delete already deleted file when post-processing (#13406) 2020-04-06 14:11:22 +02:00
publish_announcement_reaction_worker.rb
publish_scheduled_announcement_worker.rb Fix PostgreSQL load when linking in announcements (#13250) 2020-04-05 12:51:22 +02:00
publish_scheduled_status_worker.rb Fix background jobs not using locks like they are supposed to (#13361) 2020-03-31 21:59:03 +02:00
push_conversation_worker.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
push_encrypted_message_worker.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
push_update_worker.rb
redownload_media_worker.rb Fix RedownloadMediaWorker (#13741) 2020-05-12 15:55:25 +02:00
refollow_worker.rb
regeneration_worker.rb Fix background jobs not using locks like they are supposed to (#13361) 2020-03-31 21:59:03 +02:00
removal_worker.rb
resolve_account_worker.rb Fix background jobs not using locks like they are supposed to (#13361) 2020-03-31 21:59:03 +02:00
thread_resolve_worker.rb
unfavourite_worker.rb
unfollow_follow_worker.rb
unmerge_worker.rb
unpublish_announcement_worker.rb
verify_account_links_worker.rb Fix background jobs not using locks like they are supposed to (#13361) 2020-03-31 21:59:03 +02:00