Claire ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `README.md`: Upstream updated its README, we have a completely different one. Kept glitch-soc's README. - `app/models/account.rb`: Not a real conflict, upstream updated some lines textually adjacent to glitch-soc-specific lines. Ported upstream's changes.		2024-02-24 14:46:14 +01:00
..
activitypub	Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream	2024-02-24 14:46:14 +01:00
admin	…
connection_pool	…
importer	…
mastodon	…
ostatus	…
sanitize	…
translation_service	…
vacuum	…
webhooks	…
account_reach_finder_spec.rb	…
account_statuses_filter_spec.rb	…
advanced_text_formatter_spec.rb	…
cache_buster_spec.rb	…
content_security_policy_spec.rb	…
delivery_failure_tracker_spec.rb	…
emoji_formatter_spec.rb	…
entity_cache_spec.rb	…
extractor_spec.rb	…
fast_ip_map_spec.rb	…
feed_manager_spec.rb	…
hashtag_normalizer_spec.rb	…
html_aware_formatter_spec.rb	…
link_details_extractor_spec.rb	…
permalink_redirector_spec.rb	…
plain_text_formatter_spec.rb	…
request_pool_spec.rb	…
request_spec.rb	…
scope_transformer_spec.rb	…
search_query_parser_spec.rb	…
search_query_transformer_spec.rb	…
signature_parser_spec.rb	…
status_cache_hydrator_spec.rb	…
status_filter_spec.rb	…
status_finder_spec.rb	…
status_reach_finder_spec.rb	…
suspicious_sign_in_detector_spec.rb	…
tag_manager_spec.rb	…
text_formatter_spec.rb	…
webfinger_resource_spec.rb	…