You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 92c06a1113 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/admin/base_controller.rb`: Minor conflict caused by glitch-soc's theming system. - `app/javascript/mastodon/initial_state.js`: Minor conflict caused by glitch-soc making use of max_toot_chars. - `app/models/form/admin_settings.rb`: Minor conflict caused by glitch-soc's theming system. - `app/models/trends.rb`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `app/views/admin/accounts/index.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/admin/instances/show.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/layouts/application.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/settings/preferences/notifications/show.html.haml`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `config/navigation.rb`: Minor conflict caused by glitch-soc having additional navigation items for the theming system while upstream slightly changed every line.		3 years ago
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
admin	Add customizable user roles (#18641)	3 years ago
connection_pool	…
importer	Change algorithm of `tootctl search deploy` to improve performance (#18463)	3 years ago
nodeinfo	…
ostatus	…
rss	Fix errors when rendering RSS feeds (#18531)	3 years ago
settings	…
access_token_extension.rb	Fix single Redis connection being used across all threads (#18135)	3 years ago
account_reach_finder.rb	…
activity_tracker.rb	…
advanced_text_formatter.rb	Fix leading spaces being stripped in Markdown code blocks	3 years ago
application_extension.rb	Fix confirmation redirect to app without `Location` header (#18523)	3 years ago
cache_buster.rb	…
delivery_failure_tracker.rb	Fix single Redis connection being used across all threads (#18135)	3 years ago
emoji_formatter.rb	Change RSS feeds (#18356)	3 years ago
entity_cache.rb	…
extractor.rb	Fix being able to post URLs longer than 4096 characters (#17908)	3 years ago
fast_geometry_parser.rb	…
fast_ip_map.rb	…
feed_manager.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
hash_object.rb	…
html_aware_formatter.rb	Add advanced text formatting back into glitch-soc	3 years ago
inline_renderer.rb	…
link_details_extractor.rb	Add workaround for YouTube Shorts links (#17869)	3 years ago
permalink_redirector.rb	…
plain_text_formatter.rb	Refactor formatter (#17828)	3 years ago
potential_friendship_tracker.rb	…
rate_limiter.rb	…
redis_configuration.rb	Fix opening and closing Redis connections instead of using a pool (#18171)	3 years ago
request.rb	…
request_pool.rb	…
response_with_limit.rb	…
scope_parser.rb	…
scope_transformer.rb	…
search_query_parser.rb	…
search_query_transformer.rb	Fix error resposes for `from` search prefix (#17963)	3 years ago
status_filter.rb	…
status_finder.rb	…
status_reach_finder.rb	…
suspicious_sign_in_detector.rb	Remove sign-in token authentication, instead send e-mail about new sign-in (#17970)	3 years ago
tag_manager.rb	Fix TagManager#local_url? erroring out on invalid URL (#18580)	3 years ago
text_formatter.rb	Refactor formatter (#17828)	3 years ago
themes.rb	…
toc_generator.rb	…
user_settings_decorator.rb	Various code cleanup (#1782)	3 years ago
validation_error_formatter.rb	…
video_metadata_extractor.rb	…
webfinger.rb	Fix error caused by missing subject in Webfinger response (#18204)	3 years ago
webfinger_resource.rb	…