Claire 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`		2023-01-05 14:16:25 +01:00
..
activitypub	…
admin	…
connection_pool	…
importer	…
nodeinfo	…
ostatus	…
rss	…
settings	…
translation_service	…
vacuum	…
access_token_extension.rb	…
account_reach_finder.rb	…
activity_tracker.rb	…
advanced_text_formatter.rb	…
application_extension.rb	…
ascii_folding.rb	…
cache_buster.rb	…
delivery_failure_tracker.rb	…
emoji_formatter.rb	…
entity_cache.rb	…
extractor.rb	…
fast_geometry_parser.rb	…
fast_ip_map.rb	…
feed_manager.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
hash_object.rb	…
hashtag_normalizer.rb	…
html_aware_formatter.rb	…
inline_renderer.rb	…
link_details_extractor.rb	…
permalink_redirector.rb	…
plain_text_formatter.rb	…
potential_friendship_tracker.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	…
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	…
toc_generator.rb	…
translation_service.rb	…
user_settings_decorator.rb	…
vacuum.rb	…
validation_error_formatter.rb	…
video_metadata_extractor.rb	…
webfinger.rb	…
webfinger_resource.rb	…