Claire c85616ee3a Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/feed_manager.rb`: Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method. Added upstream's code. - `app/models/user_settings.rb`: Not a real conflict, glitch-soc has an extra setting textually-adjacent to a setting added upstream. Added upstream's setting. - `app/serializers/initial_state_serializer.rb`: Same. - `app/services/precompute_feed_service.rb`: Not a real conflict, glitch-soc has extra code for the direct feed. Added upstream's new code for populating lists.		2025-02-01 19:07:13 +01:00
..
activitypub	…
concerns	…
accept_notification_request_service.rb	…
account_search_service.rb	…
account_statuses_cleanup_service.rb	…
add_accounts_to_list_service.rb	…
after_block_domain_from_account_service.rb	…
after_block_service.rb	…
after_unallow_domain_service.rb	…
app_sign_up_service.rb	…
appeal_service.rb	…
approve_appeal_service.rb	…
authorize_follow_service.rb	…
backup_service.rb	…
base_service.rb	…
batched_remove_status_service.rb	…
block_domain_service.rb	…
block_service.rb	…
bootstrap_timeline_service.rb	…
bulk_import_row_service.rb	…
bulk_import_service.rb	…
clear_domain_media_service.rb	…
create_featured_tag_service.rb	…
delete_account_service.rb	…
dismiss_notification_request_service.rb	…
fan_out_on_write_service.rb	…
favourite_service.rb	…
fetch_link_card_service.rb	…
fetch_oembed_service.rb	…
fetch_remote_status_service.rb	…
fetch_resource_service.rb	…
follow_migration_service.rb	…
follow_service.rb	…
import_service.rb	…
move_service.rb	…
mute_service.rb	…
notify_service.rb	…
post_status_service.rb	…
precompute_feed_service.rb	Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream	2025-02-01 19:07:13 +01:00
process_hashtags_service.rb	…
process_mentions_service.rb	…
purge_domain_service.rb	…
reblog_service.rb	…
reject_follow_service.rb	…
remove_accounts_from_list_service.rb	…
remove_domains_from_followers_service.rb	…
remove_featured_tag_service.rb	…
remove_from_followers_service.rb	…
remove_status_service.rb	…
report_service.rb	…
resolve_account_service.rb	…
resolve_url_service.rb	…
search_service.rb	…
software_update_check_service.rb	…
statuses_search_service.rb	…
suspend_account_service.rb	…
tag_search_service.rb	…
translate_status_service.rb	…
unallow_domain_service.rb	…
unblock_domain_service.rb	…
unblock_service.rb	…
unfavourite_service.rb	…
unfollow_service.rb	…
unmute_service.rb	…
unsuspend_account_service.rb	…
update_account_service.rb	…
update_status_service.rb	…
verify_link_service.rb	…
vote_service.rb	…
webhook_service.rb	…