Thibaut Girka b9f351d845 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/actions/compose.js`: Not a “real” conflict, but change too close to a change we made to fix the vanilla WebUI locally pushing authored local-only toots in the public TL view.		2020-07-22 13:38:17 +02:00
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-22 13:38:17 +02:00
admin	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
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
after_unallow_domain_worker.rb
authorize_follow_worker.rb
backup_worker.rb
block_worker.rb
bootstrap_timeline_worker.rb
digest_mailer_worker.rb
distribution_worker.rb
domain_block_worker.rb
domain_clear_media_worker.rb
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
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
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
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
thread_resolve_worker.rb
unfavourite_worker.rb
unfollow_follow_worker.rb
unmerge_worker.rb
unpublish_announcement_worker.rb	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	2020-07-01 19:05:21 +02:00
verify_account_links_worker.rb