Claire 6b4e8c7467 Merge commit 'e8642389912b1059c921f0836825f12a0f2779db' into glitch-soc/merge-4.6 ...

Conflicts:
- `app/models/account.rb`:
  Upstream changed the display name length limit for local users,
  but glitch-soc has a configurable limit.
  Updated the default limit to be upstream's new limit.

2026-06-17 14:40:25 +02:00

..

activitypub

Remove collections feature flag (#39211)

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

admin

Add coverage for email subscription account controls (#39333)

2026-06-08 15:04:02 +00:00

api

Fix linting issues

2026-06-09 21:53:09 +02:00

auth

Extract security_key_options endpoint to standalone controller (#38367)

2026-03-25 10:35:09 +00:00

disputes

…

email_subscriptions

Add email subscriptions (#38163)

2026-03-25 16:25:45 +00:00

filters

…

oauth

Convert oauth/authorized_applications spec controller->request (#37614)

2026-01-27 10:44:24 +00:00

settings

Add import for custom filters (#39256)

2026-06-11 16:32:46 +00:00

statuses

Use to_json in simple view hash data-props build locations (#38218)

2026-03-16 14:02:52 +00:00

well_known

Change new accounts to use new ActivityPub numeric ID scheme (#36365)

2025-10-14 16:36:55 +00:00

account_show_page_spec.rb

Add meta tags to Collection HTML (#39357)

2026-06-10 13:28:52 +00:00

accounts_spec.rb

Redirect to short account URLs when requesting HTML for one of the AP endpoints (#38056)

2026-03-04 17:44:27 +00:00

anonymous_cookies_spec.rb

…

backups_spec.rb

…

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

…

collection_items_spec.rb

Remove collections feature flag (#39211)

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

collections_spec.rb

Redirect if collection AP ID is requested as HTML (#39361)

2026-06-10 15:54:50 +00:00

content_security_policy_spec.rb

Enable theming via new HTML element attributes (#37477)

2026-01-15 16:04:27 +00:00

custom_css_spec.rb

Use mime type symbol to set content_type for custom css response (#37845)

2026-05-19 07:16:24 +00:00

disabled_oauth_endpoints_spec.rb

…

emojis_spec.rb

…

filters_spec.rb

…

follower_accounts_spec.rb

…

following_accounts_spec.rb

…

health_spec.rb

…

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

…

invite_spec.rb

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

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

invites_spec.rb

…

link_headers_spec.rb

Change new accounts to use new ActivityPub numeric ID scheme (#36365)

2025-10-14 16:36:55 +00:00

localization_spec.rb

…

log_out_spec.rb

…

manifest_spec.rb

…

media_proxy_spec.rb

…

media_spec.rb

Simplify media attachment lookup in show/player actions (#38565)

2026-04-07 09:58:37 +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

Handle missing sw.js in test environment assets (#39459)

2026-06-17 12:09:12 +02:00

relationships_spec.rb

…

remote_interaction_helper_spec.rb

Update rubocop-rspec to version 3.10.1 (#39303)

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

self_destruct_spec.rb

…

severed_relationships_spec.rb

Add have_attachment matcher for attached file exports (#38389)

2026-03-25 13:18:14 +00:00

signature_verification_spec.rb

Fix refreshing keys from stale actors on signature verification error (#38515)

2026-04-02 09:07:44 +00:00

status_show_page_spec.rb

Add meta tags to Collection HTML (#39357)

2026-06-10 13:28:52 +00:00

statuses_cleanup_spec.rb

…

statuses_spec.rb

Fix some routes for numeric AP identifiers (#36304)

2025-09-30 15:09:59 +00:00

tags_spec.rb

Fix test that was broken because of different glitch-soc default settings

2026-06-07 15:17:40 +02:00

unsubscriptions_spec.rb

Add email subscriptions (#38163)

2026-03-25 16:25:45 +00:00

username_rewrites_spec.rb

Add coverage for rewrite with vary username paths (#38197)

2026-03-13 16:54:57 +00:00

wrapstodon_spec.rb

Add wrapstodon page spec (#37168)

2025-12-09 09:27:29 +00:00