mirror of
https://github.com/Dokploy/dokploy.git
synced 2026-10-23 08:55:25 +00:00
Resolve merge conflicts in drizzle migrations
This commit is contained in:
@@ -0,0 +1 @@
|
||||
ALTER TABLE "sso_provider" ADD COLUMN "domain_verified" boolean DEFAULT true NOT NULL;
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"id": "146ed901-5901-42e6-ae26-516d5909ddc6",
|
||||
"id": "72de05be-6787-4fd9-8146-68e5902357a7",
|
||||
"prevId": "68c11a1a-d7e0-475f-868f-f3a098d942a7",
|
||||
"version": "7",
|
||||
"dialect": "postgresql",
|
||||
@@ -7983,6 +7983,13 @@
|
||||
"primaryKey": false,
|
||||
"notNull": true
|
||||
},
|
||||
"domain_verified": {
|
||||
"name": "domain_verified",
|
||||
"type": "boolean",
|
||||
"primaryKey": false,
|
||||
"notNull": true,
|
||||
"default": true
|
||||
},
|
||||
"created_at": {
|
||||
"name": "created_at",
|
||||
"type": "timestamp",
|
||||
@@ -8803,7 +8810,7 @@
|
||||
"type": "jsonb",
|
||||
"primaryKey": false,
|
||||
"notNull": false,
|
||||
"default": "'{\"appName\":null,\"appDescription\":null,\"logoUrl\":null,\"faviconUrl\":null,\"customCss\":null,\"loginLogoUrl\":null,\"supportUrl\":null,\"docsUrl\":null,\"errorPageTitle\":null,\"errorPageDescription\":null,\"footerText\":null,\"ogImageUrl\":null}'::jsonb"
|
||||
"default": "'{\"appName\":null,\"appDescription\":null,\"logoUrl\":null,\"faviconUrl\":null,\"customCss\":null,\"loginLogoUrl\":null,\"supportUrl\":null,\"docsUrl\":null,\"errorPageTitle\":null,\"errorPageDescription\":null,\"metaTitle\":null,\"footerText\":null}'::jsonb"
|
||||
},
|
||||
"remoteServersOnly": {
|
||||
"name": "remoteServersOnly",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1363,8 +1363,15 @@
|
||||
{
|
||||
"idx": 194,
|
||||
"version": "7",
|
||||
"when": 1788849747825,
|
||||
"tag": "0194_freezing_skin",
|
||||
"when": 1788858506799,
|
||||
"tag": "0194_acoustic_prima",
|
||||
"breakpoints": true
|
||||
},
|
||||
{
|
||||
"idx": 195,
|
||||
"version": "7",
|
||||
"when": 1788867370653,
|
||||
"tag": "0195_classy_whirlwind",
|
||||
"breakpoints": true
|
||||
}
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user