diff --git a/apps/dokploy/components/dashboard/application/deployments/show-deployment.tsx b/apps/dokploy/components/dashboard/application/deployments/show-deployment.tsx index dec8747fb..f71a3ec10 100644 --- a/apps/dokploy/components/dashboard/application/deployments/show-deployment.tsx +++ b/apps/dokploy/components/dashboard/application/deployments/show-deployment.tsx @@ -148,7 +148,7 @@ export const ShowDeployment = ({ See all the details of this deployment |{" "} - + {filteredLogs.length} lines diff --git a/apps/dokploy/components/dashboard/deployments/show-deployments-table.tsx b/apps/dokploy/components/dashboard/deployments/show-deployments-table.tsx index 11ffae7d0..e479d9275 100644 --- a/apps/dokploy/components/dashboard/deployments/show-deployments-table.tsx +++ b/apps/dokploy/components/dashboard/deployments/show-deployments-table.tsx @@ -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; diff --git a/apps/dokploy/pages/api/providers/gitlab/callback.ts b/apps/dokploy/pages/api/providers/gitlab/callback.ts index 42d81df12..a43e88890 100644 --- a/apps/dokploy/pages/api/providers/gitlab/callback.ts +++ b/apps/dokploy/pages/api/providers/gitlab/callback.ts @@ -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, diff --git a/packages/server/src/utils/providers/gitlab.ts b/packages/server/src/utils/providers/gitlab.ts index 3907130ee..6cb777b75 100644 --- a/packages/server/src/utils/providers/gitlab.ts +++ b/packages/server/src/utils/providers/gitlab.ts @@ -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,