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

apps/dokploy/components/dashboard/shared/rebuild-database.tsx

@@ -87,29 +87,29 @@ export const RebuildDatabase = ({ id, type }: Props) => {
 									<AlertTriangle className="h-5 w-5 text-destructive" />
 									Are you absolutely sure?
 								</AlertDialogTitle>
-								<AlertDialogDescription className="space-y-2">
+								<AlertDialogDescription asChild>
-									<p>This action will:</p>
+									<div className="space-y-2">
-									<ul className="list-disc list-inside space-y-1">
+										<p>This action will:</p>
-										<li>Stop the current database service</li>
+										<ul className="list-disc list-inside space-y-1">
-										<li>Delete all existing data and volumes</li>
+											<li>Stop the current database service</li>
-										<li>Reset to the default configuration</li>
+											<li>Delete all existing data and volumes</li>
-										<li>Restart the service with a clean state</li>
+											<li>Reset to the default configuration</li>
-									</ul>
+											<li>Restart the service with a clean state</li>
-									<p className="font-medium text-destructive mt-4">
+										</ul>
-										This action cannot be undone.
+										<p className="font-medium text-destructive mt-4">
-									</p>
+											This action cannot be undone.
+										</p>
+									</div>
 								</AlertDialogDescription>
 							</AlertDialogHeader>
 							<AlertDialogFooter>
 								<AlertDialogCancel>Cancel</AlertDialogCancel>
 								<AlertDialogAction
 									onClick={handleRebuild}
-									className="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+									disabled={isPending}
-									asChild
+									variant="destructive"
 								>
-									<Button isLoading={isPending} type="submit">
+									Yes, rebuild database
-										Yes, rebuild database
-									</Button>
 								</AlertDialogAction>
 							</AlertDialogFooter>
 						</AlertDialogContent>

apps/dokploy/components/ui/sidebar.tsx

@@ -368,7 +368,7 @@ function SidebarContent({ className, ...props }: React.ComponentProps<"div">) {
 			data-slot="sidebar-content"
 			data-sidebar="content"
 			className={cn(
-				"no-scrollbar flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
+				"no-scrollbar flex min-h-0 flex-1 flex-col gap-2 overflow-y-auto overflow-x-hidden",
 				className,
 			)}
 			{...props}

apps/dokploy/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "dokploy",
-	"version": "v0.29.10",
+	"version": "v0.29.11",
 	"private": true,
 	"license": "Apache-2.0",
 	"type": "module",