Claire bd9e7d6060 Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/admin/settings/discovery/show.html.haml`:
  Glitch-soc has an extra setting textually adjacent to a line upstream has changed.
  Applied upstream's change while keeping glitch-soc's setting.

2026-03-17 18:53:00 +01:00

..

admin

Revamp heading levels in settings & admin pages (#38230)

2026-03-17 10:32:24 +00:00

auth

Replace email_spec gem with built-in matchers (#38079)

2026-03-05 14:42:21 +00:00

disputes

Replace email_spec gem with built-in matchers (#38079)

2026-03-05 14:42:21 +00:00

filters

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

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

settings

Normalize current_username on account migration (#38183)

2026-03-13 09:33:02 +00:00

streaming

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

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

about_spec.rb

…

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

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

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

invites_spec.rb

Use methods from SystemHelpers more consistently (#33973)

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

log_in_spec.rb

Add ability to require 2FA for specific roles (including Everybody) (#37701)

2026-02-11 14:34:09 +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 doorkeeper i18n for invalid code challenge method (#37827)

2026-02-17 09:01:59 +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

…

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

…

share_entrypoint_spec.rb

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

2026-03-16 14:02:52 +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

…

terms_of_service_spec.rb

Add system spec for TOS page (#33243)

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

unlogged_spec.rb

…

wrapstodon_spec.rb

Add wrapstodon page spec (#37168)

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