diff --git a/app/reviews/page.tsx b/app/reviews/page.tsx index de6ff42..29ee90f 100644 --- a/app/reviews/page.tsx +++ b/app/reviews/page.tsx @@ -9,6 +9,7 @@ import { import { session } from "@/lib/auth"; import { people, personName, priorityLabels } from "@/lib/config"; import { cachedReviewQueue } from "@/lib/reviews"; +import { mergeBlocker } from "@/lib/pipeline"; import { param, queryString } from "@/lib/window"; import { UpstreamError } from "@/lib/http"; import type { Search } from "@/lib/types"; @@ -99,7 +100,11 @@ async function Queue({ search }: { search: Search }) { )} {row.waiting} - {row.reason || row.ci} + + {row.section === "approved" + ? mergeBlocker(row.pr) + : row.reason || row.ci} + {row.size} diff --git a/tests/reviews.e2e.ts b/tests/reviews.e2e.ts index 77aca2f..0a04fd7 100644 --- a/tests/reviews.e2e.ts +++ b/tests/reviews.e2e.ts @@ -50,6 +50,8 @@ test("review queue keeps blocked pull requests out of ready", async ({ await expect( approved.getByRole("link", "Login link expiry", { exact: true }), ).toBeVisible(); + // Same readiness as Team's "Approved but unmerged" list. + await expect(approved).toContainText("Conflicts"); await expect( ready.getByRole("link", "Feed query speedup", { exact: true }), ).toHaveCount(0);