Skip to content

Commit c8b815b

Browse files
committed
fix(api): stops mapping BLOCKED mergeStateStatus as conflict
1 parent 9b03c6d commit c8b815b

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

src/app/services/api.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -588,9 +588,10 @@ async function graphqlSearchPRs(
588588
const reviewerLogins = [...new Set([...pendingLogins, ...actualLogins].map(l => l.toLowerCase()))];
589589

590590
let checkStatus = mapCheckStatus(node.commits.nodes[0]?.commit?.statusCheckRollup?.state ?? null);
591-
// mergeStateStatus overrides checkStatus when it indicates action is needed
591+
// mergeStateStatus overrides checkStatus when it indicates action is needed.
592+
// BLOCKED means required checks/reviews haven't passed — leave checkStatus from rollup.
592593
const mss = node.mergeStateStatus;
593-
if (mss === "DIRTY" || mss === "BEHIND" || mss === "BLOCKED") {
594+
if (mss === "DIRTY" || mss === "BEHIND") {
594595
checkStatus = "conflict";
595596
} else if (mss === "UNSTABLE") {
596597
checkStatus = "failure";

0 commit comments

Comments
 (0)