merge: 최신 main을 실행 중 게임 옵션 변경에 통합

# Conflicts: # packages/infra/prisma/gateway.prisma
2026-08-17 16:09:03 +00:00
parent ca6823d409 6ce472608a
commit 996357701c
79 changed files with 5542 additions and 1055 deletions
@@ -82,6 +82,7 @@ model AppUser {
  displayName            String                      @unique @map("display_name")
  passwordHash           String                      @map("password_hash")
  passwordSalt           String                      @map("password_salt")
+  passwordResetRequired  Boolean                     @default(false) @map("password_reset_required")
  roles                  Json                        @default(dbgenerated("'[]'::jsonb"))
  sanctions              Json                        @default(dbgenerated("'{}'::jsonb"))
  oauthType              OAuthType                   @default(NONE) @map("oauth_type")