Claire c9a1e27a49 Merge commit 'dbb20f76a781defe35d077529c8269d712c1fbd2' into glitch-soc/merge-upstream ...

Conflicts:
- `tsconfig.json`:
  glitch-soc had extra paths under `app/javascript/flavours`, but upstream
  added `app/javascript` as a whole, so updated to upstream's.

2025-06-25 19:29:09 +02:00

..

admin

Convert admin/users/two_factor_authentications spec controller->system (#34216)

2025-03-21 07:41:38 +00:00

api

Add coverage for standard params on push subs create (#34092)

2025-03-12 14:29:19 +00:00

auth

Update rubocop-rspec to version 3.6.0 (#34497)

2025-04-24 14:56:13 +00:00

concerns

Reduce hard coding of LOCAL_DOMAIN env value throughout tests (#35025)

2025-06-13 07:58:22 +00:00

oauth

Move layout setup for OAuth views to controllers (#35176)

2025-06-25 13:26:17 +00:00

settings

Merge commit '2254f47702368938bdfd0d997f2487fb2950d676' into glitch-soc/merge-upstream

2025-06-12 17:39:03 +02:00

application_controller_spec.rb

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

2025-04-25 17:22:10 +02:00

authorize_interactions_controller_spec.rb

…

follower_accounts_controller_spec.rb

…

following_accounts_controller_spec.rb

…

relationships_controller_spec.rb

Update rubocop-rspec to version 3.6.0 (#34497)

2025-04-24 14:56:13 +00:00