This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire c118918520 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/custom_emoji.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific validation. Applied upstream changes. - `app/models/public_feed.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific parameter documentation. Applied upstream changes.		2022-11-10 09:36:47 +01:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-02 18:46:22 +02:00
connection_pool	…
ostatus	…
settings	…
vacuum	Fix vacuum scheduler missing lock, locks never expiring (#19458)	2022-10-26 12:10:48 +02:00
advanced_text_formatter_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 branch 'main' into glitch-soc/merge-upstream	2022-10-02 18:46:22 +02:00
hash_object_spec.rb	…
hashtag_normalizer_spec.rb	…
html_aware_formatter_spec.rb	…
link_details_extractor_spec.rb	…
permalink_redirector_spec.rb	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
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	Fix filter handling in status cache hydration (#19963)	2022-11-07 19:47:48 +01:00
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	Fix typos (#19849)	2022-11-08 17:32:03 +01:00