Thibaut Girka 02062aab55 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/about_controller.rb - app/controllers/tags_controller.rb - app/views/about/show.html.haml - spec/views/about/show.html.haml_spec.rb		2019-03-13 15:16:02 +01:00
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-13 15:16:02 +01:00
admin	…
concerns	Improved remote thread fetching (#10106)	2019-02-28 15:22:21 +01:00
import	Add option to overwrite imported data (#9962)	2019-02-03 03:59:51 +01:00
maintenance	…
pubsubhubbub	…
scheduler	Create Redisable#redis (#9633)	2019-02-02 19:11:38 +01:00
web	…
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	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	…
local_notification_worker.rb	…
merge_worker.rb	…
mute_worker.rb	…
notification_worker.rb	…
poll_expiration_notify_worker.rb	Support pushing and receiving updates to poll tallies (#10209)	2019-03-11 00:49:31 +01:00
processing_worker.rb	…
publish_scheduled_status_worker.rb	Fix multiple workers for the same scheduled status being queueable (#9875)	2019-01-20 12:57:05 +01:00
push_conversation_worker.rb	…
push_update_worker.rb	…
refollow_worker.rb	…
regeneration_worker.rb	…
remote_profile_update_worker.rb	…
removal_worker.rb	…
resolve_account_worker.rb	…
salmon_worker.rb	…
thread_resolve_worker.rb	Improved remote thread fetching (#10106)	2019-02-28 15:22:21 +01:00
unfavourite_worker.rb	…
unfollow_follow_worker.rb	Follow new account before unfollowing the old one during move (#9719)	2019-01-05 11:27:58 +01:00
unmerge_worker.rb	…
verify_account_links_worker.rb	…