Claire 2d09653d50 Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb: Upstream added an `include` where we had an extra `include` due to glitch-soc's theming system. Added upstream's new `include`.		2023-07-13 13:35:15 +02:00
..
activitypub	Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream	2023-07-12 16:03:05 +02:00
admin	…
connection_pool	Update rubocop to v1.54.1 (#25627)	2023-07-13 11:11:55 +02:00
importer	…
nodeinfo	…
ostatus	…
rss	Rails 7.0 update (#25668)	2023-07-13 09:36:07 +02:00
settings	…
translation_service	…
vacuum	…
webhooks	…
access_token_extension.rb	…
account_reach_finder.rb	…
activity_tracker.rb	…
advanced_text_formatter.rb	…
application_extension.rb	…
ascii_folding.rb	…
attachment_batch.rb	…
cache_buster.rb	…
delivery_failure_tracker.rb	…
emoji_formatter.rb	Fix `Style/SlicingWithRange` cop (#25923)	2023-07-12 10:03:06 +02:00
entity_cache.rb	…
extractor.rb	…
fast_geometry_parser.rb	…
fast_ip_map.rb	…
feed_manager.rb	…
hashtag_normalizer.rb	…
html_aware_formatter.rb	…
inline_renderer.rb	Rails 7.0 update (#25668)	2023-07-13 09:36:07 +02:00
link_details_extractor.rb	…
permalink_redirector.rb	…
plain_text_formatter.rb	…
potential_friendship_tracker.rb	…
rate_limiter.rb	…
redis_configuration.rb	…
request.rb	Merge pull request from GHSA-9pxv-6qvf-pjwc	2023-07-06 15:06:23 +02:00
request_pool.rb	Update rubocop to v1.54.1 (#25627)	2023-07-13 11:11:55 +02:00
response_with_limit.rb	…
scope_parser.rb	Fix OAuth apps page crashing when listing apps with certain admin API scopes (#25713)	2023-07-04 18:58:23 +02:00
scope_transformer.rb	…
search_query_parser.rb	…
search_query_transformer.rb	…
status_cache_hydrator.rb	…
status_filter.rb	…
status_finder.rb	…
status_reach_finder.rb	…
suspicious_sign_in_detector.rb	…
tag_manager.rb	…
text_formatter.rb	Fix `Style/SlicingWithRange` cop (#25923)	2023-07-12 10:03:06 +02:00
themes.rb	…
translation_service.rb	…
user_settings_serializer.rb	…
vacuum.rb	…
validation_error_formatter.rb	…
video_metadata_extractor.rb	…
webfinger.rb	…
webfinger_resource.rb	…