Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy.git synced 2026-06-15 20:25:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into canary

Browse Source
This commit is contained in:
Mauricio Siu
2026-06-02 02:08:07 -06:00
parent 84a8083d91 30b3e1fe48
commit 798e98c181
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dokploy/drizzle/meta/_journal.json
View File

@@ -1193,4 +1193,4 @@
"breakpoints": true "breakpoints": true
} }
] ]
} }

1
apps/dokploy/server/api/routers/proprietary/sso.ts
View File

@@ -2,6 +2,7 @@ import { normalizeTrustedOrigin } from "@dokploy/server";
import { IS_CLOUD } from "@dokploy/server/constants"; import { IS_CLOUD } from "@dokploy/server/constants";
import { db } from "@dokploy/server/db"; import { db } from "@dokploy/server/db";
import { member, ssoProvider, user } from "@dokploy/server/db/schema"; import { member, ssoProvider, user } from "@dokploy/server/db/schema";
import { getWebServerSettings } from "@dokploy/server/services/web-server-settings";
import { ssoProviderBodySchema } from "@dokploy/server/db/schema/sso"; import { ssoProviderBodySchema } from "@dokploy/server/db/schema/sso";
import { import {
getOrganizationOwnerId, getOrganizationOwnerId,