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 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-28 19:23:58 +02:00
admin	…
connection_pool	…
importer	…
nodeinfo	…
ostatus	…
rss	…
settings	…
translation_service	Add mention of the translation provider when translating a post (#19433)	2022-10-24 18:37:57 +02:00
vacuum	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02: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	…
feed_manager.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
hash_object.rb	…
hashtag_normalizer.rb	…
html_aware_formatter.rb	…
inline_renderer.rb	Add caching for payload serialization during fan-out (#19642)	2022-11-04 13:21:06 +01:00
link_details_extractor.rb	…
permalink_redirector.rb	…
plain_text_formatter.rb	…
potential_friendship_tracker.rb	…
rate_limiter.rb	…
redis_configuration.rb	…
request.rb	…
request_pool.rb	…
response_with_limit.rb	…
scope_parser.rb	…
scope_transformer.rb	…
search_query_parser.rb	…
search_query_transformer.rb	…
status_cache_hydrator.rb	Fix additional issues with status cache hydration (#19747)	2022-11-04 20:01:33 +01:00
status_filter.rb	…
status_finder.rb	…
status_reach_finder.rb	Fix reblogs being discarded after the reblogged status (#19731)	2022-11-04 16:31:44 +01:00
suspicious_sign_in_detector.rb	…
tag_manager.rb	…
text_formatter.rb	…
themes.rb	…
toc_generator.rb	…
translation_service.rb	Change “Translate” button to only show up when a translation backend is configured (#19434)	2022-10-24 18:30:58 +02:00
user_settings_decorator.rb	Fix users not being able to change their hide_followers_count setting (#1889)	2022-11-05 11:55:25 +01:00
vacuum.rb	…
validation_error_formatter.rb	…
video_metadata_extractor.rb	…
webfinger.rb	…
webfinger_resource.rb	…