Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb		2019-07-23 10:51:07 +02:00
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
admin
concerns
import	Export and import show_reblogs together with following list (#10495)	2019-04-08 07:28:27 +02:00
maintenance	Add periodic removal of older thumbnails for preview cards (#11304)	2019-07-15 07:50:14 +02:00
pubsubhubbub	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
scheduler	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-23 10:51:07 +02:00
web	Change the retry limit in error of web push notification (#11292)	2019-07-15 00:48:50 +02:00
after_account_domain_block_worker.rb
after_remote_follow_request_worker.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
after_remote_follow_worker.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
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	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
mute_worker.rb
notification_worker.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
poll_expiration_notify_worker.rb
processing_worker.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
publish_scheduled_status_worker.rb
push_conversation_worker.rb
push_update_worker.rb
refollow_worker.rb
regeneration_worker.rb
remote_profile_update_worker.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
removal_worker.rb
resolve_account_worker.rb
salmon_worker.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
thread_resolve_worker.rb
unfavourite_worker.rb
unfollow_follow_worker.rb
unmerge_worker.rb
verify_account_links_worker.rb