Merge branch 'main' into bkellam/repos-pagination

Author: brendan-kellam

CHANGELOG.md

@@ -22,6 +22,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Renamed `webUrl` to `externalWebUrl` for various apis. Moving forward, `webUrl` will be used for URLs that point to Sourcebot, and `externalWebUrl` will be used for URLs that point to external code hosts. [#795](https://github.com/sourcebot-dev/sourcebot/pull/795)
 - Renamed various fields on the `/api/source` endpoint response body. [#795](https://github.com/sourcebot-dev/sourcebot/pull/795)
 
+### Fixed
+- Fixed issue where a file would fail to load when opening it from the /search view and it matched multiple branches. [#797](https://github.com/sourcebot-dev/sourcebot/pull/797)
+- [EE] Fixed GitLab OAuth token refresh failures by including the required `redirect_uri` parameter. [#798](https://github.com/sourcebot-dev/sourcebot/pull/798)
+
 ## [4.10.17] - 2026-01-23
 
 ### Fixed

packages/web/src/app/[domain]/browse/[...path]/components/codePreviewPanel.tsx

@@ -53,7 +53,7 @@ export const CodePreviewPanel = async ({ path, repoName, revisionName }: CodePre
                         displayName: repoInfoResponse.displayName,
                         externalWebUrl: repoInfoResponse.externalWebUrl,
                     }}
-                    branchDisplayName={revisionName}
+                    revisionName={revisionName}
                 />
 
                 {fileWebUrl && (

packages/web/src/app/[domain]/browse/[...path]/components/treePreviewPanel.tsx

@@ -39,7 +39,7 @@ export const TreePreviewPanel = async ({ path, repoName, revisionName }: TreePre
                     }}
                     pathType="tree"
                     isFileIconVisible={false}
-                    branchDisplayName={revisionName}
+                    revisionName={revisionName}
                 />
             </div>
             <Separator />

packages/web/src/app/[domain]/components/pathHeader.tsx

@@ -33,6 +33,7 @@ interface FileHeaderProps {
     },
     isBranchDisplayNameVisible?: boolean;
     branchDisplayName?: string;
+    revisionName?: string;
     branchDisplayTitle?: string;
     isCodeHostIconVisible?: boolean;
     isFileIconVisible?: boolean;
@@ -53,7 +54,8 @@ export const PathHeader = ({
     repo,
     path,
     pathHighlightRange,
-    branchDisplayName,
+    revisionName,
+    branchDisplayName = revisionName,
     isBranchDisplayNameVisible = !!branchDisplayName,
     branchDisplayTitle,
     pathType = 'blob',
@@ -220,7 +222,7 @@ export const PathHeader = ({
                     repoName: repo.name,
                     path: '/',
                     pathType: 'tree',
-                    revisionName: branchDisplayName,
+                    revisionName,
                     domain,
                 })}
             >
@@ -259,7 +261,7 @@ export const PathHeader = ({
                                                 repoName: repo.name,
                                                 path: segment.fullPath,
                                                 pathType: segment.isLastSegment ? pathType : 'tree',
-                                                revisionName: branchDisplayName,
+                                                revisionName,
                                                 domain,
                                             })}
                                             className="font-mono text-sm hover:cursor cursor-pointer"
@@ -288,7 +290,7 @@ export const PathHeader = ({
                                     repoName: repo.name,
                                     path: segment.fullPath,
                                     pathType: segment.isLastSegment ? pathType : 'tree',
-                                    revisionName: branchDisplayName,
+                                    revisionName,
                                     domain,
                                 })}
                             >

packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatchContainer.tsx

@@ -69,14 +69,14 @@ export const FileMatchContainer = ({
         return file.branches;
     }, [file.branches]);
 
-    const branchDisplayName = useMemo(() => {
-        if (branches.length === 0) {
-            return undefined;
-        }
-
-        return `${branches[0]}${branches.length > 1 ? ` +${branches.length - 1}` : ''}`;
+    const revisionName = useMemo(() => {
+        return branches.length > 0 ? branches[0] : undefined;
     }, [branches]);
 
+    const branchDisplayName = useMemo(() => {
+        return revisionName ? `${revisionName}${branches.length > 1 ? ` +${branches.length - 1}` : ''}` : undefined;
+    }, [branches.length, revisionName]);
+
     const repo = useMemo(() => {
         return repoInfo[file.repositoryId];
     }, [repoInfo, file.repositoryId]);
@@ -99,8 +99,9 @@ export const FileMatchContainer = ({
                     }}
                     path={file.fileName.text}
                     pathHighlightRange={fileNameRange}
-                    isBranchDisplayNameVisible={isBranchFilteringEnabled}
+                    revisionName={revisionName}
                     branchDisplayName={branchDisplayName}
+                    isBranchDisplayNameVisible={isBranchFilteringEnabled}
                     branchDisplayTitle={branches.join(", ")}
                 />
                     <Button

packages/web/src/ee/features/codeNav/components/exploreMenu/referenceList.tsx

@@ -98,7 +98,7 @@ export const ReferenceList = ({
                                         externalWebUrl: repoInfo.webUrl,
                                     }}
                                     path={file.fileName}
-                                    branchDisplayName={revisionName === "HEAD" ? undefined : revisionName}
+                                    revisionName={revisionName === "HEAD" ? undefined : revisionName}
                                 />
                             </div>
                             <div className="divide-y">

packages/web/src/ee/features/permissionSyncing/tokenRefresh.ts

@@ -119,18 +119,27 @@ export async function refreshOAuthToken(
                     continue;
                 }
 
+                // Build request body parameters
+                const bodyParams: Record<string, string> = {
+                    client_id: clientId,
+                    client_secret: clientSecret,
+                    grant_type: 'refresh_token',
+                    refresh_token: refreshToken,
+                };
+
+                // GitLab requires redirect_uri to match the original authorization request
+                // even when refreshing tokens. Use URL constructor to handle trailing slashes.
+                if (provider === 'gitlab') {
+                    bodyParams.redirect_uri = new URL('/api/auth/callback/gitlab', env.AUTH_URL).toString();
+                }
+
                 const response = await fetch(url, {
                     method: 'POST',
                     headers: {
                         'Content-Type': 'application/x-www-form-urlencoded',
                         'Accept': 'application/json',
                     },
-                    body: new URLSearchParams({
-                        client_id: clientId,
-                        client_secret: clientSecret,
-                        grant_type: 'refresh_token',
-                        refresh_token: refreshToken,
-                    }),
+                    body: new URLSearchParams(bodyParams),
                 });
 
                 if (!response.ok) {

packages/web/src/features/chat/components/chatThread/referencedFileSourceListItem.tsx

@@ -231,7 +231,7 @@ const ReferencedFileSourceListItem = ({
                         displayName: repoDisplayName,
                         externalWebUrl: repoWebUrl,
                     }}
-                    branchDisplayName={revision === 'HEAD' ? undefined : revision}
+                    revisionName={revision === 'HEAD' ? undefined : revision}
                     repoNameClassName="font-normal text-muted-foreground text-sm"
                 />
             </div>