Claire 077e0c6812 Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system.		2023-12-20 22:16:50 +01:00
..
activitypub	Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream	2023-12-19 20:51:37 +01:00
admin	…
connection_pool	…
importer	…
mastodon	…
ostatus	…
sanitize	Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream	2023-12-17 23:04:16 +01:00
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	Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream	2023-12-17 23:04:16 +01:00
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	…
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	…