Claire 59e02a628d Merge commit 'f652c54c3334890176331f62150559a96eeb41ae' into glitch-soc/merge-upstream ...

Conflicts:
- `app/services/backup_service.rb`:
  Upstream refactored activity serialization while glitch-soc passed an extra argument.
  Followed upstream's refactor, keeping our extra argument.

2026-02-05 12:43:12 +01:00

..

admin

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

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

api

Finish migration of api/web/push_subscriptions controller->request spec (#35482)

2025-07-24 07:46:09 +00:00

auth

Update devise to version 5.0 (#37419)

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

concerns

Update stoplight to version 5.4.0 (#36581)

2025-10-27 09:38:01 +00:00

settings

Merge commit '7af5ba271d6f04831f000e9b815914375e42abeb' into glitch-soc/merge-upstream

2026-01-27 18:03:27 +01:00

application_controller_spec.rb

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

2025-08-05 15:46:33 +02: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

…