Merge pull request #579 from coollabsio/next

v3.8.8

apps/api/package.json

@@ -23,7 +23,7 @@
     "@fastify/static": "6.5.0",
     "@iarna/toml": "2.2.5",
     "@ladjs/graceful": "3.0.2",
-    "@prisma/client": "4.2.1",
+    "@prisma/client": "3.15.2",
     "axios": "0.27.2",
     "bcryptjs": "2.4.3",
     "bree": "9.1.2",
@@ -62,7 +62,7 @@
     "eslint-plugin-prettier": "4.2.1",
     "nodemon": "2.0.19",
     "prettier": "2.7.1",
-    "prisma": "4.2.1",
+    "prisma": "3.15.2",
     "rimraf": "3.0.2",
     "tsconfig-paths": "4.1.0",
     "typescript": "4.7.4"

apps/api/src/lib/common.ts

@@ -21,7 +21,7 @@ import { scheduler } from './scheduler';
 import { supportedServiceTypesAndVersions } from './services/supportedVersions';
 import { includeServices } from './services/common';
 
-export const version = '3.8.6';
+export const version = '3.8.8';
 export const isDev = process.env.NODE_ENV === 'development';
 
 const algorithm = 'aes-256-ctr';
@@ -1537,4 +1537,4 @@ export function decryptApplication(application: any) {
 
         return application;
     }
-}
+}

apps/api/src/routes/api/v1/applications/handlers.ts

@@ -451,7 +451,7 @@ export async function deployApplication(request: FastifyRequest<DeployApplicatio
                     applicationId: id,
                     sourceBranch: branch,
                     branch: application.branch,
-                    pullmergeRequestId: pullmergeRequestId.toString(),
+                    pullmergeRequestId: pullmergeRequestId?.toString(),
                     forceRebuild,
                     destinationDockerId: application.destinationDocker?.id,
                     gitSourceId: application.gitSource?.id,
@@ -937,4 +937,4 @@ export async function cancelDeployment(request: FastifyRequest<CancelDeployment>
     } catch ({ status, message }) {
         return errorHandler({ status, message })
     }
-}
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "coolify",
   "description": "An open-source & self-hostable Heroku / Netlify alternative.",
-  "version": "3.8.6",
+  "version": "3.8.8",
   "license": "Apache-2.0",
   "repository": "github:coollabsio/coolify",
   "scripts": {
@@ -38,4 +38,4 @@
     "open-source",
     "coolify"
   ]
-}
+}