Claire 8d717ab161 Merge commit '1d46558e8d949860acc4f3a86516b9989bd74f79' into glitch-soc/merge-upstream ...

Conflicts:
- `spec/controllers/application_controller_spec.rb`:
  Upstream moved specs that were textually-adjacent to glitch-soc ones.
  Kept the glitch-soc ones.

2026-03-09 18:14:15 +01:00

..

admin

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

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

api

…

auth

Update devise to version 5.0 (#37419)

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

concerns

Extract ErrorResponses from application controller (#38105)

2026-03-09 11:30:41 +00:00

settings

Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream

2026-02-18 18:40:03 +01:00

application_controller_spec.rb

Merge commit '1d46558e8d949860acc4f3a86516b9989bd74f79' into glitch-soc/merge-upstream

2026-03-09 18:14:15 +01:00

authorize_interactions_controller_spec.rb

…

follower_accounts_controller_spec.rb

Add coverage for blocked account scenario in following/followers (#36042)

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

following_accounts_controller_spec.rb

Add coverage for blocked account scenario in following/followers (#36042)

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

relationships_controller_spec.rb

…