MergeRequestAcceptor - detailed info for unexpected situation (#198)

pepakriz · web-flow · commit 0d47590b4184 · 2024-04-04T14:54:19.000+02:00
diff --git a/server/src/MergeRequestAcceptor.ts b/server/src/MergeRequestAcceptor.ts
@@ -331,7 +331,7 @@ export const acceptMergeRequest = async (
 	}
 
 	if (mergeRequestInfo.detailed_merge_status !== DetailedMergeStatus.Mergeable) {
-		const message = `The merge request can't be merged due to unexpected merge status: ${mergeRequestInfo.detailed_merge_status}`;
+		const message = `The merge request can't be merged due to unexpected status. Merge status: ${mergeRequestInfo.detailed_merge_status} and pipeline status: ${currentPipeline.status}`;
 		console.log(`[MR][${mergeRequestInfo.iid}] merge failed: ${message}, assigning back`);
 
 		await Promise.all([

Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ export const acceptMergeRequest = async (`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`if (mergeRequestInfo.detailed_merge_status !== DetailedMergeStatus.Mergeable) {`
`334`		- const message = `The merge request can't be merged due to unexpected merge status: ${mergeRequestInfo.detailed_merge_status}`;
	`334`	+ const message = `The merge request can't be merged due to unexpected status. Merge status: ${mergeRequestInfo.detailed_merge_status} and pipeline status: ${currentPipeline.status}`;
`335`	`335`	console.log(`[MR][${mergeRequestInfo.iid}] merge failed: ${message}, assigning back`);
`336`	`336`
`337`	`337`	`await Promise.all([`