gsadmin/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy.git synced 2026-10-15 13:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'canary' into feat/docker-health-dashboard

Browse Source
This commit is contained in:
Mauricio Siu
2026-08-13 14:45:23 -06:00
parent 95b1afc2c2 8e18a8a683
commit a4425cfb1d
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/dokploy/components/dashboard/application/deployments/show-deployment.tsx
+1 -1
View File
@@ -148,7 +148,7 @@ export const ShowDeployment = ({
<DialogDescription className="flex items-center gap-2">
<span className="flex items-center gap-2">
See all the details of this deployment |{" "}
<Badge variant="blank" className="text-xs">
<Badge variant="blank" className="text-xs tabular-nums">
{filteredLogs.length} lines
</Badge>
</span>
apps/dokploy/components/dashboard/deployments/show-deployments-table.tsx
+2 -2
View File
@@ -78,7 +78,7 @@ function getServiceInfo(d: DeploymentRow) {
projectName: app.environment.project.name,
environmentName: app.environment.name,
serviceId: app.applicationId,
href: `/dashboard/project/${app.environment.project.projectId}/environment/${app.environment.environmentId}/services/application/${app.applicationId}`,
href: `/dashboard/project/${app.environment.project.projectId}/environment/${app.environment.environmentId}/services/application/${app.applicationId}?tab=deployments`,
};
}
if (comp?.environment?.project && comp.environment) {
@@ -91,7 +91,7 @@ function getServiceInfo(d: DeploymentRow) {
projectName: comp.environment.project.name,
environmentName: comp.environment.name,
serviceId: comp.composeId,
href: `/dashboard/project/${comp.environment.project.projectId}/environment/${comp.environment.environmentId}/services/compose/${comp.composeId}`,
href: `/dashboard/project/${comp.environment.project.projectId}/environment/${comp.environment.environmentId}/services/compose/${comp.composeId}?tab=deployments`,
};
}
return null;
apps/dokploy/pages/api/providers/gitlab/callback.ts
+3 -1
View File
@@ -53,7 +53,9 @@ export default async function handler(
return res.status(400).json({ error: "Missing or invalid code" });
}
const expiresAt = Math.floor(Date.now() / 1000) + result.expires_in;
const expiresAt = result.expires_in
? Math.floor(Date.now() / 1000) + result.expires_in
: null;
await updateGitlab(gitlab.gitlabId, {
accessToken: result.access_token,
refreshToken: result.refresh_token,
packages/server/src/utils/providers/gitlab.ts
+3 -1
View File
@@ -44,7 +44,9 @@ export const refreshGitlabToken = async (gitlabProviderId: string) => {
const data = await response.json();
const expiresAt = Math.floor(Date.now() / 1000) + data.expires_in;
const expiresAt = data.expires_in
? Math.floor(Date.now() / 1000) + data.expires_in
: null;
await updateGitlab(gitlabProviderId, {
accessToken: data.access_token,