Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.		2022-11-06 09:50:41 +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	Fix typos (#18604)	2022-08-28 17:44:34 +02:00
sanitize_config_spec.rb	…
scope_transformer_spec.rb	…
status_cache_hydrator_spec.rb	Fix additional issues with status cache hydration (#19747)	2022-11-04 20:01:33 +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	…