You cannot 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 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.		6 years ago
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
admin	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	7 years ago
concerns	…
import	Fix performance of follow import (#13836)	6 years ago
scheduler	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
web	Fix web push subscriptions being deleted on rate limit or timeout (#11826)	7 years ago
after_account_domain_block_worker.rb	…
authorize_follow_worker.rb	…
backup_worker.rb	Change local media attachments to perform heavy processing asynchronously (#13210)	6 years ago
block_worker.rb	…
bootstrap_timeline_worker.rb	…
digest_mailer_worker.rb	…
distribution_worker.rb	…
domain_block_worker.rb	Make domain block/silence/reject-media code more robust (#13424)	6 years ago
domain_clear_media_worker.rb	Make domain block/silence/reject-media code more robust (#13424)	6 years ago
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	Fix various issues with account migration (#12301)	6 years ago
mute_worker.rb	…
poll_expiration_notify_worker.rb	Fix background jobs not using locks like they are supposed to (#13361)	6 years ago
post_process_media_worker.rb	Fix trying to delete already deleted file when post-processing (#13406)	6 years ago
publish_announcement_reaction_worker.rb	Add streaming API updates for announcements being modified or deleted (#12963)	6 years ago
publish_scheduled_announcement_worker.rb	Fix PostgreSQL load when linking in announcements (#13250)	6 years ago
publish_scheduled_status_worker.rb	Fix background jobs not using locks like they are supposed to (#13361)	6 years ago
push_conversation_worker.rb	Add E2EE API (#13820)	6 years ago
push_encrypted_message_worker.rb	Add E2EE API (#13820)	6 years ago
push_update_worker.rb	…
redownload_media_worker.rb	Fix RedownloadMediaWorker (#13741)	6 years ago
refollow_worker.rb	Fix RefollowWorker not keeping show_reblogs setting (#12707)	6 years ago
regeneration_worker.rb	Fix background jobs not using locks like they are supposed to (#13361)	6 years ago
removal_worker.rb	Add soft delete for statuses for instant deletes through API (#11623)	7 years ago
resolve_account_worker.rb	Fix background jobs not using locks like they are supposed to (#13361)	6 years ago
thread_resolve_worker.rb	…
unfavourite_worker.rb	…
unfollow_follow_worker.rb	Fix various issues with account migration (#12301)	6 years ago
unmerge_worker.rb	…
unpublish_announcement_worker.rb	Add streaming API updates for announcements being modified or deleted (#12963)	6 years ago
verify_account_links_worker.rb	Fix background jobs not using locks like they are supposed to (#13361)	6 years ago