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	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-28 11:33:34 +01:00
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	Add IP-based rules (#14963)	2020-10-12 16:33:49 +02:00
feed_manager.rb
hash_object.rb
hashtag_normalizer.rb
html_aware_formatter.rb	Add advanced text formatting back into glitch-soc	2022-03-28 22:21:37 +02:00
inline_renderer.rb
link_details_extractor.rb
permalink_redirector.rb
plain_text_formatter.rb
potential_friendship_tracker.rb
rate_limiter.rb
redis_configuration.rb	Add retention policy for cached content and media (#19232)	2022-09-27 03:08:19 +02:00
request.rb
request_pool.rb
response_with_limit.rb
scope_parser.rb
scope_transformer.rb
search_query_parser.rb
search_query_transformer.rb	Fix error resposes for from search prefix (#17963)	2022-04-08 21:21:49 +02:00
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