| ... | ... | @@ -1728,7 +1728,7 @@ export function PullRequestDetailPanel({ |
| 1728 | 1728 | <span className="inline-flex shrink-0"> |
| 1729 | 1729 | <Button |
| 1730 | 1730 | size="xs" |
| 1731 | | variant="ghost" |
| 1731 | variant="default" |
| 1732 | 1732 | disabled={handoff !== null} |
| 1733 | 1733 | onClick={startResolveConflicts} |
| 1734 | 1734 | aria-label={ |
| ... | ... | @@ -1754,15 +1754,12 @@ export function PullRequestDetailPanel({ |
| 1754 | 1754 | <span className="inline-flex shrink-0"> |
| 1755 | 1755 | <Button |
| 1756 | 1756 | size="xs" |
| 1757 | | variant="ghost" |
| 1757 | variant="default" |
| 1758 | 1758 | disabled={actionPending} |
| 1759 | 1759 | onClick={() => void perform("ready")} |
| 1760 | 1760 | aria-label="Ready for review" |
| 1761 | 1761 | > |
| 1762 | | <GitPullRequestIcon |
| 1763 | | aria-hidden |
| 1764 | | className="hidden size-3.5 @max-[30rem]/pr-header:inline" |
| 1765 | | /> |
| 1762 | <GitPullRequestIcon aria-hidden className="size-3.5" /> |
| 1766 | 1763 | <span className="@max-[30rem]/pr-header:hidden">Ready for review</span> |
| 1767 | 1764 | </Button> |
| 1768 | 1765 | </span> |
| ... | ... | @@ -1777,7 +1774,7 @@ export function PullRequestDetailPanel({ |
| 1777 | 1774 | <span className="inline-flex shrink-0"> |
| 1778 | 1775 | <Button |
| 1779 | 1776 | size="xs" |
| 1780 | | variant="ghost" |
| 1777 | variant="default" |
| 1781 | 1778 | disabled={actionPending} |
| 1782 | 1779 | onClick={() => |
| 1783 | 1780 | setConfirmation({ open: true, action: "enable-auto-merge" }) |
| ... | ... | @@ -1829,17 +1826,14 @@ export function PullRequestDetailPanel({ |
| 1829 | 1826 | <span className="inline-flex shrink-0"> |
| 1830 | 1827 | <Button |
| 1831 | 1828 | size="xs" |
| 1832 | | variant="ghost" |
| 1829 | variant="default" |
| 1833 | 1830 | disabled={actionPending} |
| 1834 | 1831 | onClick={() => setConfirmation({ open: true, action: "merge" })} |
| 1835 | 1832 | aria-label={ |
| 1836 | 1833 | pendingAction === "merge" ? "Merging..." : selectedMergeMethodLabel |
| 1837 | 1834 | } |
| 1838 | 1835 | > |
| 1839 | | <GitMergeIcon |
| 1840 | | aria-hidden |
| 1841 | | className="hidden size-3.5 @max-[30rem]/pr-header:inline" |
| 1842 | | /> |
| 1836 | <GitMergeIcon aria-hidden className="size-3.5" /> |
| 1843 | 1837 | <span className="@max-[30rem]/pr-header:hidden"> |
| 1844 | 1838 | {pendingAction === "merge" ? "Merging..." : selectedMergeMethodLabel} |
| 1845 | 1839 | </span> |