Claire e08c8b6933 Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/settings_helper.rb`:
  Upstream added a new helper.
  Conflict caused by the fact there is a glitch-soc specific helper.
  Added upstream's new helper in addition to glitch-soc's.

2026-06-09 21:30:54 +02:00

..

activitypub

Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream

2026-06-09 21:30:54 +02:00

admin

Update chewy to version 8.0.1 (#37983)

2026-03-17 13:27:37 +00:00

annual_report

Change wrapstodon 2025 to allow unlisted posts in top statuses (#37206)

2025-12-11 16:35:35 +00:00

connection_pool

…

elasticsearch

Update chewy to version 8.0.1 (#37983)

2026-03-17 13:27:37 +00:00

fasp

Include hosts resolver in request socket DNS lookup (#38699)

2026-04-17 08:09:37 +00:00

importer

…

mastodon

Prefer to_json over JSON.generate when simple strings in stub request (#38258)

2026-03-17 16:10:54 +00:00

ostatus

…

paperclip

…

request

Handle IPv6 scenario in custom Request::Socket (#38866)

2026-04-30 16:03:55 +00:00

sanitize

Merge commit '07236016bcc78a82205093b3e067bf4a1bb07d88' into glitch-soc/merge-upstream

2026-06-03 12:19:05 +02:00

translation_service

Rescue JSON::ParserError where already converted (#38244)

2026-03-17 08:57:10 +00:00

vacuum

…

webhooks

Prefer to_json over JSON.generate when simple strings in stub request (#38258)

2026-03-17 16:10:54 +00:00

account_reach_finder_spec.rb

…

account_statuses_filter_spec.rb

Add exclude_direct flag to /api/v1/accounts/:id/statuses to exclude direct messages (#37763)

2026-02-27 09:34:12 +00:00

advanced_text_formatter_spec.rb

…

annual_report_spec.rb

Remove unused data from 2025 annual reports (#37033)

2025-11-28 08:58:34 +00:00

antispam_spec.rb

Fix banned text being able to be circumvented via unicode (#35978)

2025-09-02 07:29:03 +00:00

cache_buster_spec.rb

…

collection_reach_finder_spec.rb

Add collection reach finder (#39346)

2026-06-09 14:22:21 +00:00

content_security_policy_spec.rb

…

delivery_failure_tracker_spec.rb

…

domain_resource_spec.rb

…

emoji_formatter_spec.rb

Update rubocop-rspec to version 3.10.1 (#39303)

2026-06-08 15:27:34 +00:00

entity_cache_spec.rb

…

extractor_spec.rb

Fix hashtags not being picked up when full-width hash sign is used (#36103)

2025-10-27 17:18:01 +00:00

fast_ip_map_spec.rb

…

feed_manager_spec.rb

Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream

2026-03-16 18:16:56 +01:00

hashtag_normalizer_spec.rb

…

html_aware_formatter_spec.rb

…

interaction_policy_spec.rb

Extract interaction policy class (#37277)

2025-12-17 10:12:43 +00:00

link_details_extractor_spec.rb

Extract text from language tagged strings for link preview (#39190)

2026-06-01 15:10:08 +00:00

permalink_redirector_spec.rb

Redirect with interstitial when trying to view a remote collection while logged out (#38941)

2026-05-07 16:04:26 +00:00

plain_text_formatter_spec.rb

…

private_address_check_spec.rb

Avoid rubocop:disable for private address spec (#38420)

2026-03-26 15:03:10 +00:00

request_pool_spec.rb

Migrate a few tests to use NotificationAssertions (#38098)

2026-06-08 16:01:20 +00:00

request_spec.rb

Include hosts resolver in request socket DNS lookup (#38699)

2026-04-17 08:09:37 +00:00

scope_transformer_spec.rb

…

search_query_parser_spec.rb

…

search_query_transformer_spec.rb

…

signature_parser_spec.rb

…

status_cache_hydrator_spec.rb

Remove collections feature flag (#39211)

2026-05-29 09:37:42 +00:00

status_filter_spec.rb

…

status_finder_spec.rb

…

status_reach_finder_spec.rb

…

suspicious_sign_in_detector_spec.rb

…

tag_manager_spec.rb

Add coverage for TagManager#normalize_domain (#35994)

2026-01-21 16:11:38 +00:00

text_formatter_spec.rb

…

webfinger_resource_spec.rb

Fix Webfinger endpoint not handling new AP ID scheme (#38391)

2026-03-26 09:58:47 +00:00

webfinger_spec.rb

Clean up Webfinger lib spec (#38259)

2026-03-18 13:23:06 +00:00