History

Merge branch 'Dokploy:canary' into fix/command-dialog-crash

Yash Kumar committed 4 months ago

Commit 3912c1a2 parents bb30dc1 532c8d03 files · +18 −18Browse files

Unified · Split

3 files
  1. apps/dokploy/components/dashboard/shared/rebuild-database.tsx +16 −16
  2. apps/dokploy/components/ui/sidebar.tsx +1 −1
  3. apps/dokploy/package.json +1 −1
apps/dokploy/components/dashboard/shared/rebuild-database.tsx+16−16
@@ -87,29 +87,29 @@ export const RebuildDatabase = ({ id, type }: Props) => { · 86 unmodified lines
8787 <AlertTriangle className="h-5 w-5 text-destructive" />
8888 Are you absolutely sure?
8989 </AlertDialogTitle>
90− <AlertDialogDescription className="space-y-2">
91− <p>This action will:</p>
92− <ul className="list-disc list-inside space-y-1">
93− <li>Stop the current database service</li>
94− <li>Delete all existing data and volumes</li>
95− <li>Reset to the default configuration</li>
96− <li>Restart the service with a clean state</li>
97− </ul>
98− <p className="font-medium text-destructive mt-4">
99− This action cannot be undone.
100− </p>
90+ <AlertDialogDescription asChild>
91+ <div className="space-y-2">
92+ <p>This action will:</p>
93+ <ul className="list-disc list-inside space-y-1">
94+ <li>Stop the current database service</li>
95+ <li>Delete all existing data and volumes</li>
96+ <li>Reset to the default configuration</li>
97+ <li>Restart the service with a clean state</li>
98+ </ul>
99+ <p className="font-medium text-destructive mt-4">
100+ This action cannot be undone.
101+ </p>
102+ </div>
101103 </AlertDialogDescription>
102104 </AlertDialogHeader>
103105 <AlertDialogFooter>
104106 <AlertDialogCancel>Cancel</AlertDialogCancel>
105107 <AlertDialogAction
106108 onClick={handleRebuild}
107− className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
108− asChild
109+ disabled={isPending}
110+ variant="destructive"
109111 >
110− <Button isLoading={isPending} type="submit">
111− Yes, rebuild database
112− </Button>
112+ Yes, rebuild database
113113 </AlertDialogAction>
114114 </AlertDialogFooter>
115115 </AlertDialogContent>
apps/dokploy/components/ui/sidebar.tsx+1−1
@@ -368,7 +368,7 @@ function SidebarContent({ className, ...props }: React.ComponentProps<"div">) { · 367 unmodified lines
368368 data-slot="sidebar-content"
369369 data-sidebar="content"
370370 className={cn(
371− "no-scrollbar flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
371+ "no-scrollbar flex min-h-0 flex-1 flex-col gap-2 overflow-y-auto overflow-x-hidden",
372372 className,
373373 )}
374374 {...props}
apps/dokploy/package.json+1−1
@@ -1,6 +1,6 @@
11 {
22 "name": "dokploy",
3− "version": "v0.29.10",
3+ "version": "v0.29.11",
44 "private": true,
55 "license": "Apache-2.0",
66 "type": "module",

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t