From 52c0d1305810a932ebf2eb6f0853675ae63da686 Mon Sep 17 00:00:00 2001
From: eti <eti@eti.tf>
Date: Thu, 8 Oct 2026 18:24:43 +0200
Subject: [PATCH] web: clarify merge, CI approval and delete labels

Signed-off-by: eti <eti@eti.tf>
---
 web/src/lib/components/repo/pulls/PullActions.svelte |  4 ++--
 .../lib/components/repo/pulls/PullApproveCi.svelte   |  2 +-
 web/src/lib/components/repo/tickets/Ticket.svelte    |  2 +-
 web/src/lib/components/ui/SplitButton.stories.svelte |  4 ++--
 .../[version]/[[range]]/PullViewPage.stories.svelte  | 12 ++++++------
 web/src/routes/dev/components/+page.svelte           |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/web/src/lib/components/repo/pulls/PullActions.svelte b/web/src/lib/components/repo/pulls/PullActions.svelte
index 5037a6894..29cdc4065 100644
--- a/web/src/lib/components/repo/pulls/PullActions.svelte
+++ b/web/src/lib/components/repo/pulls/PullActions.svelte
@@ -6,7 +6,7 @@
 		style: MergeStyle;
 		label: string;
 		buttonLabel: string;
-	}[] = [{ style: "rebase", label: "Rebase", buttonLabel: "Merge (rebase)" }];
+	}[] = [{ style: "rebase", label: "Rebase", buttonLabel: "Rebase & merge" }];
 </script>
 
 <script lang="ts">
@@ -94,7 +94,7 @@
 				{loading}
 				onclick={onDeleteBranch}
 			>
-				Delete Branch
+				Delete branch
 			</Button>
 		{/if}
 	{/if}
diff --git a/web/src/lib/components/repo/pulls/PullApproveCi.svelte b/web/src/lib/components/repo/pulls/PullApproveCi.svelte
index 9c11f0c8d..61f7b8208 100644
--- a/web/src/lib/components/repo/pulls/PullApproveCi.svelte
+++ b/web/src/lib/components/repo/pulls/PullApproveCi.svelte
@@ -89,7 +89,7 @@
 				loading={run.loading}
 				onclick={() => run.run()}
 			>
-				Approve
+				Approve CI run
 			</Button>
 		{/if}
 	{/snippet}
diff --git a/web/src/lib/components/repo/tickets/Ticket.svelte b/web/src/lib/components/repo/tickets/Ticket.svelte
index a5e594463..6ccb6ab22 100644
--- a/web/src/lib/components/repo/tickets/Ticket.svelte
+++ b/web/src/lib/components/repo/tickets/Ticket.svelte
@@ -210,7 +210,7 @@
 	bind:open={deleteConfirmOpen}
 	title={isPull ? "Delete this pull request?" : "Delete this issue?"}
 	description="This cannot be undone."
-	confirmLabel="Delete"
+	confirmLabel={isPull ? "Delete pull request" : "Delete issue"}
 	loading={remove.loading}
 	onconfirm={confirmRemove}
 />
diff --git a/web/src/lib/components/ui/SplitButton.stories.svelte b/web/src/lib/components/ui/SplitButton.stories.svelte
index e1f9f7b6d..0cf56c7b3 100644
--- a/web/src/lib/components/ui/SplitButton.stories.svelte
+++ b/web/src/lib/components/ui/SplitButton.stories.svelte
@@ -11,7 +11,7 @@
 		tags: ["autodocs"],
 		args: {
 			options: [
-				{ label: "Merge (rebase)", icon: GitMerge },
+				{ label: "Rebase & merge", icon: GitMerge },
 				{
 					label: "Manually mark as merged",
 					buttonLabel: "Merge (manual)",
@@ -38,7 +38,7 @@
 	name="With a danger option"
 	args={{
 		options: [
-			{ label: "Merge (rebase)", icon: GitMerge },
+			{ label: "Rebase & merge", icon: GitMerge },
 			{ label: "Close without merging", icon: Trash2, danger: true }
 		]
 	}}
diff --git a/web/src/routes/[handle]/[repo]/pulls/[rkey]/[version]/[[range]]/PullViewPage.stories.svelte b/web/src/routes/[handle]/[repo]/pulls/[rkey]/[version]/[[range]]/PullViewPage.stories.svelte
index fe3e696cf..df83f91e3 100644
--- a/web/src/routes/[handle]/[repo]/pulls/[rkey]/[version]/[[range]]/PullViewPage.stories.svelte
+++ b/web/src/routes/[handle]/[repo]/pulls/[rkey]/[version]/[[range]]/PullViewPage.stories.svelte
@@ -219,7 +219,7 @@ Depends on the hydrant filter change, so this is stacked on \`sv-fe\`.`;
 		await waitFor(() =>
 			expect(canvas.getByRole("button", { name: "Resubmit" })).toBeDisabled()
 		);
-		await expect(canvas.getByRole("button", { name: /merge \(rebase\)/i })).toBeEnabled();
+		await expect(canvas.getByRole("button", { name: /rebase & merge/i })).toBeEnabled();
 	}}
 />
 
@@ -239,7 +239,7 @@ Depends on the hydrant filter change, so this is stacked on \`sv-fe\`.`;
 	parameters={{ auth: asAuthor, pullFetch: { conflicted: true } }}
 	play={async ({ canvas }) => {
 		await waitFor(() =>
-			expect(canvas.getByRole("button", { name: /merge \(rebase\)/i })).toBeDisabled()
+			expect(canvas.getByRole("button", { name: /rebase & merge/i })).toBeDisabled()
 		);
 		// a conflicted file is a link into the diff, and the diff virtualizes its
 		// cards: the click has to hand the scroller the file instead of leaving
@@ -310,7 +310,7 @@ Depends on the hydrant filter change, so this is stacked on \`sv-fe\`.`;
 	parameters={{ auth: asReviewer }}
 	play={async (context) => {
 		const dialog = await openApproval(context);
-		await userEvent.click(within(dialog).getByRole("button", { name: "Approve" }));
+		await userEvent.click(within(dialog).getByRole("button", { name: "Approve CI run" }));
 		await waitFor(() => expect(within(dialog).getByText("CI approved")).toBeVisible());
 		await userEvent.click(within(dialog).getByRole("button", { name: "Done" }));
 		await waitFor(() =>
@@ -332,11 +332,11 @@ Depends on the hydrant filter change, so this is stacked on \`sv-fe\`.`;
 	parameters={{ auth: asReviewer }}
 	play={async (context) => {
 		const dialog = await openApproval(context);
-		await userEvent.click(within(dialog).getByRole("button", { name: "Approve" }));
+		await userEvent.click(within(dialog).getByRole("button", { name: "Approve CI run" }));
 		await waitFor(() =>
 			expect(within(dialog).getByText("spindle rejected the trigger")).toBeVisible()
 		);
-		await expect(within(dialog).getByRole("button", { name: "Approve" })).toBeVisible();
+		await expect(within(dialog).getByRole("button", { name: "Approve CI run" })).toBeVisible();
 	}}
 />
 
@@ -347,7 +347,7 @@ Depends on the hydrant filter change, so this is stacked on \`sv-fe\`.`;
 	play={async ({ canvas }) => {
 		await expect(canvas.getAllByText("Merged").at(-1)!).toBeVisible();
 		await expect(canvas.queryByRole("button", { name: "Close" })).toBeNull();
-		await expect(canvas.getByRole("button", { name: "Delete Branch" })).toBeVisible();
+		await expect(canvas.getByRole("button", { name: "Delete branch" })).toBeVisible();
 	}}
 />
 
diff --git a/web/src/routes/dev/components/+page.svelte b/web/src/routes/dev/components/+page.svelte
index f4b566290..a906cd64d 100644
--- a/web/src/routes/dev/components/+page.svelte
+++ b/web/src/routes/dev/components/+page.svelte
@@ -462,7 +462,7 @@
 	<SplitButton
 		variant="primary"
 		options={[
-			{ label: "Merge (rebase)", icon: GitMerge },
+			{ label: "Rebase & merge", icon: GitMerge },
 			{ label: "Manually mark as merged", buttonLabel: "Merge (manual)", icon: CircleCheck },
 			{ label: "Close without merging", icon: Trash2, danger: true }
 		]}
-- 
knotmirror 0.0.1