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	…
admin	…
annual_report	…
connection_pool	…
importer	…
node_info	…
ostatus	…
rss	…
translation_service	…
vacuum	…
webhooks	…
access_token_extension.rb	…
account_reach_finder.rb	…
account_statuses_filter.rb	…
activity_tracker.rb	…
advanced_text_formatter.rb	…
annual_report.rb	…
application_extension.rb	…
ascii_folding.rb	…
attachment_batch.rb	…
cache_buster.rb	…
content_security_policy.rb	…
delivery_failure_tracker.rb	…
emoji_formatter.rb	…
entity_cache.rb	…
extractor.rb	…
fast_geometry_parser.rb	…
fast_ip_map.rb	…
feed_manager.rb	…
hashtag_normalizer.rb	…
html_aware_formatter.rb	…
inline_renderer.rb	…
link_details_extractor.rb	…
permalink_redirector.rb	…
plain_text_formatter.rb	…
rate_limiter.rb	…
redis_configuration.rb	…
request.rb	…
request_pool.rb	…
response_with_limit.rb	…
scope_parser.rb	…
scope_transformer.rb	…
search_query_parser.rb	…
search_query_transformer.rb	…
signature_parser.rb	…
status_cache_hydrator.rb	…
status_filter.rb	…
status_finder.rb	…
status_reach_finder.rb	…
suspicious_sign_in_detector.rb	…
tag_manager.rb	…
text_formatter.rb	…
themes.rb	…
translation_service.rb	…
user_settings_serializer.rb	…
vacuum.rb	…
validation_error_formatter.rb	…
video_metadata_extractor.rb	…
webfinger.rb	…
webfinger_resource.rb	…