agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-12 21:23:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

GitLab Synchronization: Fixed more merging related problems

Browse Source
This commit is contained in:
Florian Porrmann
2026-09-28 00:34:31 +02:00
committed by yu-i-i
parent 9c041338b3
commit cb59625058
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/modules/gitlab-sync/app/src/GitLabApiClient.mjs
+1 -1
View File
@@ -468,7 +468,7 @@ async function getBlobContent(token, repoFullName, sha) {
return await fetchGitLabJson(url, {
headers: buildHeaders(token),
signal: AbortSignal.timeout(REQUEST_LONG_TIMEOUT_MS)
}, 'getBlobContent').then(r => Buffer.from(r.content, 'base64'))
}, 'getBlobContent').then(r => r.content || '')
}
async function listNewCommitsWithStatus(token, fullName, branchName, fromCommit) {
services/web/modules/gitlab-sync/app/src/GitMerge.mjs
+1 -2
View File
@@ -278,8 +278,7 @@ async function resolveConflictSyncState(
token,
repoFullName,
defaultBranchName,
newOlBranchHead,
tempBranchName,
tempBranchName
)
if (conflict) {