Claire 155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream ... Conflicts: - `CONTRIBUTING.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `README.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `app/helpers/application_helper.rb`: Upstream added helpers where glitch-soc had extra ones. Added upstream's new helpers. - `app/models/form/admin_settings.rb`: Upstream added some custom handling of one setting, while glitch-soc had additional code. Ported upstream's code. - `lib/mastodon/version.rb`: Upstream moved some things to `config/mastodon.yml`. Did the same. - `spec/requests/api/v1/accounts/credentials_spec.rb`: I don't know honestly.		2025-01-10 20:41:36 +01:00
..
activitypub	Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream	2025-01-10 20:41:36 +01:00
admin	Update Rails to version 7.2.2 (#30391)	2024-11-07 14:58:20 +00:00
annual_report	Extract constants for `AnnualReport::*` minimum thresholds (#33469)	2025-01-06 18:22:32 +00:00
connection_pool	…
importer	…
node_info	…
ostatus	Fix `Style/RedundantReturn` cop (#28391)	2023-12-18 09:50:51 +00:00
rss	…
translation_service	…
vacuum	…
webhooks	…
access_grant_extension.rb	…
access_token_extension.rb	…
account_reach_finder.rb	…
account_statuses_filter.rb	…
activity_tracker.rb	…
advanced_text_formatter.rb	…
annual_report.rb	…
antispam.rb	…
application_extension.rb	Refer to constant values from `api/v1/apps` request spec (#33488)	2025-01-07 16:28:54 +00:00
ascii_folding.rb	…
attachment_batch.rb	…
cache_buster.rb	…
content_security_policy.rb	…
delivery_failure_tracker.rb	…
domain_resource.rb	…
emoji_formatter.rb	…
entity_cache.rb	…
extractor.rb	…
fast_geometry_parser.rb	…
fast_ip_map.rb	Add IP-based rules (#14963)	2020-10-12 16:33:49 +02:00
feed_manager.rb	Merge commit '752d49eefef48262d501ba5fc2006d2c8466a000' into glitch-soc/merge-upstream	2024-12-02 21:08:15 +01:00
hashtag_normalizer.rb	…
html_aware_formatter.rb	…
inline_renderer.rb	…
link_details_extractor.rb	LinkDetailsExtractor adjustments (#31357)	2024-11-22 08:00:14 +00:00
nokogiri_handler.rb	…
permalink_redirector.rb	…
plain_text_formatter.rb	…
private_address_check.rb	…
rate_limiter.rb	…
redis_connection.rb	…
request.rb	Do now swallow response body on persistent connection (#32729)	2025-01-09 08:35:35 +00:00
request_pool.rb	…
response_with_limit.rb	…
scope_parser.rb	…
scope_transformer.rb	…
search_query_parser.rb	…
search_query_transformer.rb	…
signature_parser.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	Change URL truncation to account for ellipses (#33229)	2024-12-10 08:41:06 +00:00
themes.rb	…
translation_service.rb	…
user_settings_serializer.rb	…
vacuum.rb	…
validation_error_formatter.rb	…
video_metadata_extractor.rb	Handle rotation is not present in the video metadata (#33261)	2024-12-11 04:47:42 +00:00
web_push_request.rb	…
webfinger.rb	…
webfinger_resource.rb	…