Thibaut Girka c56a504d11 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/rest/account_serializer.rb`: Upstream added code too close to glitch-soc-specific followers-hiding code. Ported upstream changes.		2020-01-27 15:46:50 +01:00
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-12 15:57:34 +01:00
admin	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	2019-09-11 16:32:44 +02:00
concerns
import
pubsubhubbub
scheduler	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-27 15:46:50 +01: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
after_remote_follow_request_worker.rb
after_remote_follow_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
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	Fix various issues with account migration (#12301)	2019-11-07 09:05:07 +02:00
mute_worker.rb
notification_worker.rb
poll_expiration_notify_worker.rb
processing_worker.rb
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	Add publish/unpublish controls to announcements in admin UI (#12967)	2020-01-27 11:05:33 +01:00
publish_scheduled_status_worker.rb
push_conversation_worker.rb
push_update_worker.rb
redownload_media_worker.rb	Add retry for failed media downloads and tootctl media refresh (#11775)	2019-09-10 15:29:12 +02:00
refollow_worker.rb	Fix RefollowWorker not keeping show_reblogs setting (#12707)	2020-01-02 20:52:39 +01:00
regeneration_worker.rb
remote_profile_update_worker.rb
removal_worker.rb
resolve_account_worker.rb
salmon_worker.rb
thread_resolve_worker.rb
unfavourite_worker.rb
unfollow_follow_worker.rb	Fix various issues with account migration (#12301)	2019-11-07 09:05:07 +02:00
unmerge_worker.rb
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