Thibaut Girka 980c004f06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one		2020-01-12 15:57:34 +01:00
..
activitypub
admin
concerns
import
pubsubhubbub
scheduler
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	Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252)	2018-01-15 04:34:28 +01:00
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
mute_worker.rb	Add conversations API (#8832)	2018-10-07 23:44:58 +02:00
notification_worker.rb
poll_expiration_notify_worker.rb
processing_worker.rb
publish_scheduled_status_worker.rb
push_conversation_worker.rb
push_update_worker.rb
redownload_media_worker.rb
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	Improve background jobs params and error handling	2017-01-05 03:28:21 +01:00
unfollow_follow_worker.rb
unmerge_worker.rb
verify_account_links_worker.rb	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00