Claire 4fbd1ad7ae Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream ...

Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.

They were all manually resolved by adapting the relevant code.

2026-02-11 13:32:18 +01:00

..

admin

Convert admin/confirmations spec controller->request/system (#37738)

2026-02-05 10:04:10 +00:00

auth

Remove duplicate set_locale around action in auth/registrations (#36455)

2025-12-03 15:34:10 +00: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

settings

Migrate to new theming infrastructure (#37612)

2026-02-10 10:59:47 +00:00

streaming

Fix streaming still being authorized for suspended accounts (#36448)

2025-10-13 13:35:44 +00:00

about_spec.rb

Move body class to shared partial for web app controller concern views (#31797)

2024-11-15 15:49:26 +00:00

account_notes_spec.rb

Replace local vars with let in JS-enabled system specs (#34905)

2025-06-05 07:08:52 +00:00

captcha_spec.rb

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

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

filters_spec.rb

Relax hard-coded attr names in system specs (#35903)

2025-08-26 08:23:45 +00:00

home_spec.rb

Fix tests on glitch-soc

2025-10-28 20:39:10 +01:00

invites_spec.rb

Use methods from SystemHelpers more consistently (#33973)

2025-03-07 08:02:55 +00:00

log_in_spec.rb

Update devise to version 5.0 (#37419)

2026-02-05 11:05:32 +00:00

log_out_spec.rb

Add "More" to the sidebar menu with links to mutes, blocks, and so on (#34987)

2025-06-11 16:12:04 +00:00

media_spec.rb

Add coverage for media#player scenarios (#35947)

2025-11-21 14:46:29 +00:00

new_statuses_spec.rb

Replace local vars with let in JS-enabled system specs (#34905)

2025-06-05 07:08:52 +00:00

oauth_spec.rb

Update dependency doorkeeper to v5.8.0 (#33000)

2024-11-21 13:48:30 +00:00

ocr_spec.rb

Increase OCR spec timeout from 10 to 20 seconds to improve CI stability (#37393)

2026-01-06 09:51:57 +00:00

privacy_spec.rb

Move body class to shared partial for web app controller concern views (#31797)

2024-11-15 15:49:26 +00:00

profile_spec.rb

Relax hard-coded attr names in system specs (#35903)

2025-08-26 08:23:45 +00:00

redirections_spec.rb

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

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

report_interface_spec.rb

Assert on page contents before reloading report for interface JS spec (#34132)

2025-03-11 09:14:16 +00:00

severed_relationships_spec.rb

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

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

share_entrypoint_spec.rb

Redirect on success for standalone compose (#35763)

2025-08-13 13:52:29 +00:00

statuses_cleanup_spec.rb

Convert statuses_cleanup controller specs to system specs (#33363)

2024-12-19 13:34:54 +00:00

statuses_spec.rb

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

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

tags_spec.rb

Move body class to shared partial for web app controller concern views (#31797)

2024-11-15 15:49:26 +00:00

terms_of_service_spec.rb

Add system spec for TOS page (#33243)

2024-12-10 14:14:28 +00:00

unlogged_spec.rb

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

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

wrapstodon_spec.rb

Add wrapstodon page spec (#37168)

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