Claire 2d4b4b0b45 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Upstream introduced support for private pinned toots, but glitch-soc's query was a bit different as it filtered out local-only toots. Used upstream's query, while adding local-only filtering back. - `app/controllers/activitypub/collections_controller.rb`: Same thing with regards to local-only posts. - `app/validators/status_pin_validator.rb`: Not a real conflict, but the line below was different in glitch-soc due to the configurable pinned toots limit.		2022-01-17 08:28:52 +01:00
..
activitypub
admin	Add ability to purge undeliverable domains from admin interface (#16686)	2021-12-17 23:01:21 +01:00
concerns
import
scheduler	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-16 18:11:20 +01:00
web	Change Web Push API deliveries to use request pooling (#16014)	2021-04-12 14:25:34 +02:00
account_deletion_worker.rb
account_merging_worker.rb	Fix resolving accounts sometimes creating duplicate records for a given AP id (#15364)	2020-12-18 23:26:26 +01:00
after_account_domain_block_worker.rb
after_unallow_domain_worker.rb	Fix removing allowed domains being done synchronously (#14302)	2020-07-15 21:08:19 +02:00
authorize_follow_worker.rb
backup_worker.rb
block_worker.rb
bootstrap_timeline_worker.rb
cache_buster_worker.rb	Add cache buster feature for media files (#15155)	2020-11-19 17:38:06 +01:00
delete_mute_worker.rb
digest_mailer_worker.rb
distribution_worker.rb	Fix some RedisLocks auto-releasing too fast (#16276)	2021-05-19 23:52:08 +02:00
domain_block_worker.rb
domain_clear_media_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
poll_expiration_notify_worker.rb
post_process_media_worker.rb
publish_announcement_reaction_worker.rb
publish_scheduled_announcement_worker.rb
publish_scheduled_status_worker.rb
push_conversation_worker.rb
push_encrypted_message_worker.rb
push_update_worker.rb
redownload_avatar_worker.rb	Fix to be able to redownload avatar and header (#16190)	2021-05-11 14:19:22 +02:00
redownload_header_worker.rb
redownload_media_worker.rb	Fix media redownload worker retrying on unexpected response codes (#16111)	2021-05-05 23:46:59 +02:00
refollow_worker.rb
regeneration_worker.rb
remote_account_refresh_worker.rb
removal_worker.rb
resolve_account_worker.rb
thread_resolve_worker.rb
unfavourite_worker.rb
unfollow_follow_worker.rb
unmerge_worker.rb
unpublish_announcement_worker.rb
verify_account_links_worker.rb