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

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

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

2026-06-09 21:30:54 +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

fix naming of custom filter export param (#39304)

2026-06-05 16:02:20 +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

…

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

…

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

Remove collections feature flag (#39211)

2026-05-29 09:37:42 +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

…

intents_spec.rb

…

invite_spec.rb

…

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

…

public_files_spec.rb

…

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

…

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