You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 4aa6aba6ee Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/services/remove_status_service.rb Conflict because we still handle the direct timeline. Took upstream changes, with that one extra function call. - config/locales/ca.yml Conflict because theme names were updated. Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/oc.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/pl.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts.		6 years ago
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
admin	Improve account suspension speed and completeness (#9290)	6 years ago
concerns	Improved remote thread fetching (#10106)	6 years ago
import	Add option to overwrite imported data (#9962)	6 years ago
maintenance	…
pubsubhubbub	…
scheduler	Create Redisable#redis (#9633)	6 years ago
web	Do no retry web push workers if the server returns a 4xx response (#9434)	6 years ago
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	Add conversations API (#8832)	6 years ago
bootstrap_timeline_worker.rb	…
digest_mailer_worker.rb	…
distribution_worker.rb	Avoid race condition when streaming deleted statuses (#10280)	6 years ago
domain_block_worker.rb	…
feed_insert_worker.rb	…
fetch_reply_worker.rb	Improved remote thread fetching (#10106)	6 years ago
import_worker.rb	Add option to overwrite imported data (#9962)	6 years ago
link_crawl_worker.rb	…
local_notification_worker.rb	Optimize the process of following someone (#9220)	6 years ago
merge_worker.rb	…
mute_worker.rb	Add conversations API (#8832)	6 years ago
notification_worker.rb	…
poll_expiration_notify_worker.rb	Fix wrong method used in PollExpirationNotifyWorker (#10265)	6 years ago
processing_worker.rb	…
publish_scheduled_status_worker.rb	Fix multiple workers for the same scheduled status being queueable (#9875)	6 years ago
push_conversation_worker.rb	Add conversations API (#8832)	6 years ago
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)	6 years ago
unfavourite_worker.rb	…
unfollow_follow_worker.rb	Follow new account before unfollowing the old one during move (#9719)	6 years ago
unmerge_worker.rb	…
verify_account_links_worker.rb	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago