fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-28 19:10:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/workers
History
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 Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 2019-09-11 16:32:44 +02:00
concerns Improved remote thread fetching (#10106) 2019-02-28 15:22:21 +01:00
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 Fix web push subscriptions being deleted on rate limit or timeout (#11826) 2019-09-13 19:15:47 +02:00
after_account_domain_block_worker.rb Fix domain hiding logic (#7765) 2018-06-09 22:46:54 +02:00
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 Add conversations API (#8832) 2018-10-07 23:44:58 +02:00
bootstrap_timeline_worker.rb Default follows for new users (#4871) 2017-09-10 09:58:38 +02:00
digest_mailer_worker.rb Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252) 2018-01-15 04:34:28 +01:00
distribution_worker.rb Avoid race condition when streaming deleted statuses (#10280) 2019-03-16 20:18:47 +01:00
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 Use a redis-cached feed for the DM timeline 2019-06-27 16:44:12 +02:00
fetch_reply_worker.rb Improved remote thread fetching (#10106) 2019-02-28 15:22:21 +01:00
import_worker.rb Add option to overwrite imported data (#9962) 2019-02-03 03:59:51 +01:00
link_crawl_worker.rb Improve error handling on LinkCrawlWorker (#5250) 2017-10-06 20:39:08 +02:00
local_notification_worker.rb Optimize the process of following someone (#9220) 2018-11-08 21:05:42 +01:00
merge_worker.rb Separate background jobs into different queues. ATTENTION: new queue "pull" 2017-04-04 00:53:20 +02:00
move_worker.rb Fix various issues with account migration (#12301) 2019-11-07 09:05:07 +02:00
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 Add streaming API updates for announcements being modified or deleted (#12963) 2020-01-26 20:07:26 +01:00
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 Lists (#5703) 2017-11-18 00:16:48 +01:00
redownload_media_worker.rb Fix RedownloadMediaWorker (#13741) 2020-05-12 15:55:25 +02:00
refollow_worker.rb Fix RefollowWorker not keeping show_reblogs setting (#12707) 2020-01-02 20:52:39 +01:00
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 Add soft delete for statuses for instant deletes through API (#11623) 2019-08-22 21:55:56 +02:00
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 Improved remote thread fetching (#10106) 2019-02-28 15:22:21 +01:00
unfavourite_worker.rb Improve background jobs params and error handling 2017-01-05 03:28:21 +01:00
unfollow_follow_worker.rb Fix various issues with account migration (#12301) 2019-11-07 09:05:07 +02:00
unmerge_worker.rb Separate background jobs into different queues. ATTENTION: new queue "pull" 2017-04-04 00:53:20 +02:00
unpublish_announcement_worker.rb Add streaming API updates for announcements being modified or deleted (#12963) 2020-01-26 20:07:26 +01:00
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