Claire 3a31ef11cc Merge commit 'db0cd9489c70e985da961a585f3a809ca449dccf' into glitch-soc/merge-upstream ...

Conflicts:
- `app/services/post_status_service.rb`:
  Upstream updated the logic to move the CW to the text content.
  Glitch-soc does not move CW to text content but has some logic
  to avoid the text being empty. Update the logic according to upstream's
  change.
- `docker-compose.yml`:
  Conflict because of different paths for composer images.
  Updated version as upstream did while keeping our path.

2025-09-17 20:10:28 +02:00

..

activitypub

Rework FEP-7888 implementation (#36064)

2025-09-09 18:27:30 +00:00

admin

Use pluck on DomainAllow.allowed_domains for export (#36019)

2025-09-05 12:30:18 +00:00

api

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

2025-09-17 20:10:28 +02:00

auth

Merge commit from fork

2025-02-27 15:44:35 +01:00

disputes

Convert disputes/strikes spec controller->request/system (#34191)

2025-03-18 08:18:36 +00:00

filters

Convert filters/statuses spec controller->system/request (#34232)

2025-03-24 08:11:34 +00:00

oauth

Update OAuth inflection to match spec (#35160)

2025-06-25 07:52:30 +00:00

settings

Convert settings/pictures spec controller->request (#34340)

2025-04-02 12:58:47 +00:00

statuses

Convert statuses#activity action controller to request spec (#33336)

2024-12-17 16:37:30 +00:00

well_known

Move "limited federation mode" config to x.mastodon area (#35041)

2025-06-16 06:13:03 +00:00

account_show_page_spec.rb

Use response.parsed_body for html response checks (#31750)

2024-09-04 17:29:05 +00:00

accounts_spec.rb

Remove render_template from accounts request spec (#33519)

2025-01-09 08:17:11 +00:00

anonymous_cookies_spec.rb

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

backups_spec.rb

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

cache_spec.rb

Move "limited federation mode" config to x.mastodon area (#35041)

2025-06-16 06:13:03 +00:00

catch_all_route_request_spec.rb

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

content_security_policy_spec.rb

Reduce hard coding of LOCAL_DOMAIN env value throughout tests (#35025)

2025-06-13 07:58:22 +00:00

custom_css_spec.rb

Extend custom CSS cache time with digest paths (#33207)

2025-01-08 08:48:45 +00:00

disabled_oauth_endpoints_spec.rb

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

emojis_spec.rb

Remove body_as_json in favor of built-in response.parsed_body for JSON response specs (#31749)

2024-09-06 09:58:46 +00:00

filters_spec.rb

Use expect for nested params in more controllers (#33675)

2025-01-22 08:35:34 +00:00

follower_accounts_spec.rb

…

following_accounts_spec.rb

…

health_spec.rb

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

instance_actor_spec.rb

Move "limited federation mode" config to x.mastodon area (#35041)

2025-06-16 06:13:03 +00:00

intents_spec.rb

Convert intents spec controller->request (#34261)

2025-03-25 09:07:22 +00:00

invite_spec.rb

Add coverage for api/v1/invites scenarios (#35389)

2025-07-21 14:17:53 +00:00

invites_spec.rb

Use expect for nested params in more controllers (#33675)

2025-01-22 08:35:34 +00:00

link_headers_spec.rb

Reduce hard coding of LOCAL_DOMAIN env value throughout tests (#35025)

2025-06-13 07:58:22 +00:00

localization_spec.rb

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

log_out_spec.rb

Remove body_as_json in favor of built-in response.parsed_body for JSON response specs (#31749)

2024-09-06 09:58:46 +00:00

mail_subscriptions_spec.rb

…

manifest_spec.rb

Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream

2024-09-06 19:25:31 +02:00

media_proxy_spec.rb

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

media_spec.rb

Convert media controller spec to request spec (#31634)

2024-08-29 08:46:00 +00:00

omniauth_callbacks_spec.rb

Use config_for for omniauth enabled values (#35015)

2025-06-24 09:32:13 +00:00

public_files_spec.rb

Add specs for PublicFileServer middleware (#35219)

2025-06-30 11:23:11 +00:00

relationships_spec.rb

Use expect in remaining controller locations (#33748)

2025-01-27 16:32:06 +00:00

remote_interaction_helper_spec.rb

Reduce hard coding of LOCAL_DOMAIN env value throughout tests (#35025)

2025-06-13 07:58:22 +00:00

self_destruct_spec.rb

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

severed_relationships_spec.rb

Add coverage for CSV responses for severed relationships (#31962)

2024-09-20 13:13:47 +00:00

signature_verification_spec.rb

Better error response to malformed headers (#35278)

2025-07-08 09:31:04 +00:00

status_show_page_spec.rb

Allow more flexible host/port treatment with LOCAL_DOMAIN values in tests (#35040)

2025-06-16 13:12:23 +00:00

statuses_cleanup_spec.rb

Use expect for nested params in more controllers (#33675)

2025-01-22 08:35:34 +00:00

statuses_spec.rb

Convert statuses spec controller->system/request (#33921)

2025-02-18 11:43:49 +00:00

tags_spec.rb

Add rel alternate rss/json links to tags show html page (#33179)

2024-12-05 11:34:49 +00:00