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	…
connection_pool	…
ostatus	…
settings	…
vacuum	…
advanced_text_formatter_spec.rb	Use a tree‐based approach for advanced text formatting (#1907)	2022-12-02 10:29:42 +01:00
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	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
hash_object_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	…
sanitize_config_spec.rb	…
scope_transformer_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	…
user_settings_decorator_spec.rb	…
webfinger_resource_spec.rb	…