mirror of
https://github.com/documenso/documenso.git
synced 2026-07-11 21:45:18 +10:00
chore: merge main, resolve biome formatting conflicts
Merge origin/main into feat/external-2fa-codes. Resolve formatting conflicts caused by biome rollout; preserve both feature streams: PR's external 2FA token + signing-session 2FA proof additions plus main's RateLimit/RecipientExpired/signingReminders/date-auto-insert. In complete-document-with-token.ts, drop the duplicate early field-fetching block introduced when main moved that logic later with date auto-insert support; keep the EXTERNAL_TWO_FACTOR_AUTH check using derivedRecipientActionAuth.
This commit is contained in:
@@ -26,6 +26,14 @@ services:
|
||||
- 2500:2500
|
||||
- 1100:1100
|
||||
|
||||
redis:
|
||||
image: redis:8-alpine
|
||||
container_name: redis
|
||||
ports:
|
||||
- 63790:6379
|
||||
volumes:
|
||||
- redis:/data
|
||||
|
||||
minio:
|
||||
image: minio/minio
|
||||
container_name: minio
|
||||
@@ -42,4 +50,5 @@ services:
|
||||
|
||||
volumes:
|
||||
minio:
|
||||
redis:
|
||||
documenso_database:
|
||||
|
||||
Reference in New Issue
Block a user