Thibaut Girka 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.		2019-08-29 12:07:50 +02:00
..
activitypub
admin
concerns
import
maintenance
pubsubhubbub
scheduler	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-28 16:28:05 +02: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	Add domain block notes (#11515)	2019-08-07 20:20:23 +02:00
feed_insert_worker.rb
fetch_reply_worker.rb
import_worker.rb
link_crawl_worker.rb
local_notification_worker.rb
merge_worker.rb
mute_worker.rb
notification_worker.rb
poll_expiration_notify_worker.rb
processing_worker.rb
publish_scheduled_status_worker.rb
push_conversation_worker.rb
push_update_worker.rb
refollow_worker.rb
regeneration_worker.rb
remote_profile_update_worker.rb
removal_worker.rb	Add soft delete for statuses for instant deletes through API (#11623)	2019-08-22 21:55:56 +02:00
resolve_account_worker.rb
salmon_worker.rb
thread_resolve_worker.rb
unfavourite_worker.rb
unfollow_follow_worker.rb
unmerge_worker.rb
verify_account_links_worker.rb