Workaround for detailed_merge_status=need_rebase issue (#197)

pepakriz · web-flow · commit d6bf04d66456 · 2024-04-04T08:41:01.000+02:00
diff --git a/server/src/GitlabApi.ts b/server/src/GitlabApi.ts
@@ -27,6 +27,7 @@ export enum DetailedMergeStatus {
 	NotOpen = 'not_open',
 	JiraAssociationMissing = 'jira_association_missing',
 	NeedsRebase = 'needs_rebase',
+	NeedRebase = 'need_rebase', // Wrong, but existing value. See https://gitlab.com/gitlab-org/gitlab/-/issues/454409
 	Conflict = 'conflict',
 	RequestedChanges = 'requested_changes',
 }
diff --git a/server/src/MergeRequestAcceptor.ts b/server/src/MergeRequestAcceptor.ts
@@ -205,7 +205,10 @@ export const acceptMergeRequest = async (
 		return 'continue';
 	}
 
-	if (mergeRequestInfo.detailed_merge_status === DetailedMergeStatus.NeedsRebase) {
+	if (
+		mergeRequestInfo.detailed_merge_status === DetailedMergeStatus.NeedsRebase ||
+		mergeRequestInfo.detailed_merge_status === DetailedMergeStatus.NeedRebase
+	) {
 		console.log(`[MR][${mergeRequestInfo.iid}] source branch is not up to date, rebasing`);
 		await tryCancelPipeline(gitlabApi, mergeRequestInfo, user);
 		await gitlabApi.rebaseMergeRequest(

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ export enum DetailedMergeStatus {`
`27`	`27`	`NotOpen = 'not_open',`
`28`	`28`	`JiraAssociationMissing = 'jira_association_missing',`
`29`	`29`	`NeedsRebase = 'needs_rebase',`
	`30`	`+ NeedRebase = 'need_rebase', // Wrong, but existing value. See https://gitlab.com/gitlab-org/gitlab/-/issues/454409`
`30`	`31`	`Conflict = 'conflict',`
`31`	`32`	`RequestedChanges = 'requested_changes',`
`32`	`33`	`}`