Claire be493b6c0d Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly.		2022-02-26 09:29:23 +01:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-10 19:09:27 +01:00
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-02-26 09:29:23 +01:00
web	…
account_deletion_worker.rb	…
account_merging_worker.rb	…
after_account_domain_block_worker.rb	…
after_unallow_domain_worker.rb	…
authorize_follow_worker.rb	…
backup_worker.rb	…
block_worker.rb	…
bootstrap_timeline_worker.rb	…
cache_buster_worker.rb	…
delete_mute_worker.rb	…
digest_mailer_worker.rb	…
distribution_worker.rb	Add support for editing for published statuses (#16697)	2022-01-19 22:37:27 +01:00
domain_block_worker.rb	…
domain_clear_media_worker.rb	…
feed_insert_worker.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-28 08:58:32 +01:00
fetch_reply_worker.rb	…
import_worker.rb	…
link_crawl_worker.rb	…
local_notification_worker.rb	Add notifications when a reblogged status has been updated (#17404)	2022-02-11 22:20:19 +01:00
merge_worker.rb	…
move_worker.rb	…
mute_worker.rb	…
poll_expiration_notify_worker.rb	Add support for editing for published statuses (#16697)	2022-01-19 22:37:27 +01:00
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	Add support for editing for published statuses (#16697)	2022-01-19 22:37:27 +01:00
redownload_avatar_worker.rb	…
redownload_header_worker.rb	…
redownload_media_worker.rb	…
refollow_worker.rb	…
regeneration_worker.rb	…
remote_account_refresh_worker.rb	Add support for private pinned posts (#16954)	2022-01-17 00:49:55 +01:00
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	…