Claire 2d029dedd9 Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes.		2023-05-08 15:28:36 +02:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-29 10:44:56 +02:00
admin	Update retention model sql query (#24249)	2023-03-26 00:37:57 +01:00
connection_pool	Bump connection_pool from 2.3.0 to 2.4.0 (#24290)	2023-04-30 15:45:02 +09:00
importer
nodeinfo
ostatus
rss
settings
translation_service	Replace Status#translatable? with language matrix in separate endpoint (#24037)	2023-03-16 11:07:24 +01:00
vacuum
access_token_extension.rb
account_reach_finder.rb
activity_tracker.rb
advanced_text_formatter.rb	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
application_extension.rb
ascii_folding.rb
cache_buster.rb
delivery_failure_tracker.rb
emoji_formatter.rb	Drop EOL Ruby 2.7 (#24237)	2023-04-27 01:46:18 +02:00
entity_cache.rb
extractor.rb
fast_geometry_parser.rb
fast_ip_map.rb
feed_manager.rb	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
hash_object.rb
hashtag_normalizer.rb
html_aware_formatter.rb
inline_renderer.rb
link_details_extractor.rb
permalink_redirector.rb
plain_text_formatter.rb	Drop EOL Ruby 2.7 (#24237)	2023-04-27 01:46:18 +02:00
potential_friendship_tracker.rb
rate_limiter.rb
redis_configuration.rb
request.rb	Refactor monkey-patching of PrivateAddressCheck (#24122)	2023-03-16 04:33:38 +01:00
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
status_filter.rb
status_finder.rb
status_reach_finder.rb
suspicious_sign_in_detector.rb
tag_manager.rb
text_formatter.rb	Drop EOL Ruby 2.7 (#24237)	2023-04-27 01:46:18 +02:00
themes.rb	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
translation_service.rb	Replace Status#translatable? with language matrix in separate endpoint (#24037)	2023-03-16 11:07:24 +01:00
user_settings_serializer.rb	Change user settings to be stored in a more optimal way (#23630)	2023-03-30 14:44:00 +02:00
vacuum.rb
validation_error_formatter.rb
video_metadata_extractor.rb
webfinger.rb
webfinger_resource.rb