Claire 90528f43bc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream.		2021-01-06 18:08:06 +01:00
..
activitypub
admin
concerns
import	Fix being able to import more than allowed number of follows (#15384)	2020-12-26 23:52:46 +01:00
scheduler	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-23 01:47:45 +01:00
web
account_deletion_worker.rb	Fix AccountDeletionWorker crashing and clogging sidekiq queues (#15380)	2020-12-20 18:25:00 +01:00
account_merging_worker.rb	Fix resolving accounts sometimes creating duplicate records for a given AP id (#15364)	2020-12-18 23:26:26 +01:00
after_account_domain_block_worker.rb
after_unallow_domain_worker.rb
authorize_follow_worker.rb	Fix being able to import more than allowed number of follows (#15384)	2020-12-26 23:52:46 +01:00
backup_worker.rb
block_worker.rb
bootstrap_timeline_worker.rb
cache_buster_worker.rb
delete_mute_worker.rb
digest_mailer_worker.rb
distribution_worker.rb
domain_block_worker.rb
domain_clear_media_worker.rb
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
poll_expiration_notify_worker.rb
post_process_media_worker.rb
publish_announcement_reaction_worker.rb
publish_scheduled_announcement_worker.rb
publish_scheduled_status_worker.rb
push_conversation_worker.rb
push_encrypted_message_worker.rb
push_update_worker.rb
redownload_media_worker.rb
refollow_worker.rb	Fix being able to import more than allowed number of follows (#15384)	2020-12-26 23:52:46 +01:00
regeneration_worker.rb
removal_worker.rb
resolve_account_worker.rb
thread_resolve_worker.rb
unfavourite_worker.rb
unfollow_follow_worker.rb	Fix being able to import more than allowed number of follows (#15384)	2020-12-26 23:52:46 +01:00
unmerge_worker.rb
unpublish_announcement_worker.rb
verify_account_links_worker.rb