merge: resolve v1.22.0 conflicts with custom

This commit is contained in:
2026-08-31 07:37:26 -04:00
200 changed files with 44922 additions and 775 deletions
@@ -62,6 +62,8 @@ import { InProgressOperationBanner } from './git/InProgressOperationBanner';
import { BranchIntegrationSection, type OperationLogEntry } from './git/BranchIntegrationSection';
import { deriveBaseBranch } from './git/baseBranch';
import { getFreshestPrStatusForBranch, useGitHubPrStatusStore } from '@/stores/useGitHubPrStatusStore';
import { useGitLabMrForBranch } from '@/lib/gitlabMrStatus';
import { useGiteaPrForBranch } from '@/lib/giteaPrStatus';
import { createGitIndexMutationQueue, type GitIndexMutationDirection, type GitIndexMutationQueue } from './git/gitIndexMutationQueue';
import type { GitRemote } from '@/lib/gitApi';
import { getRootBranch } from '@/lib/worktrees/worktreeStatus';
@@ -320,6 +322,8 @@ export const GitView: React.FC<GitViewProps> = ({ isActive }) => {
const openContextSurface = useUIStore((state) => state.openContextSurface);
const prStatusBranch = status?.current ?? null;
const { mr: gitLabMr } = useGitLabMrForBranch(currentDirectory, prStatusBranch);
const { pr: giteaPr } = useGiteaPrForBranch(currentDirectory, prStatusBranch);
const prChipStatus = useGitHubPrStatusStore((state) => {
if (!gitDirectory || !prStatusBranch) {
return null;
@@ -2408,6 +2412,14 @@ export const GitView: React.FC<GitViewProps> = ({ isActive }) => {
: undefined
}
repositoryRoot={gitDirectory !== currentDirectory ? currentDirectory : undefined}
gitLabMr={gitLabMr}
onOpenGitLabMr={
currentDirectory ? () => openContextSurface(currentDirectory, 'pr') : undefined
}
giteaPr={giteaPr}
onOpenGiteaPr={
currentDirectory ? () => openContextSurface(currentDirectory, 'pr') : undefined
}
/>
{/* In-progress operation banner */}