From 217df7012c59c85aa9c7dbf062aa72edc52e96cb Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 23 Aug 2025 17:11:11 +0900 Subject: [PATCH] Fix Wiki branch resolution in blob endpoint (#3826) --- .../scala/gitbucket/core/controller/WikiController.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/WikiController.scala b/src/main/scala/gitbucket/core/controller/WikiController.scala index 7cb982b33..0c59854d1 100644 --- a/src/main/scala/gitbucket/core/controller/WikiController.scala +++ b/src/main/scala/gitbucket/core/controller/WikiController.scala @@ -306,7 +306,8 @@ trait WikiControllerBase extends ControllerBase { get("/:owner/:repository/wiki/_history")(referrersOnly { repository => Using.resource(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git => - JGitUtil.getCommitLog(git, "master") match { + val branch = getWikiBranch(repository.owner, repository.name) + JGitUtil.getCommitLog(git, branch) match { case Right((logs, hasNext)) => html.history(None, logs, repository, isEditable(repository)) case Left(_) => NotFound() } @@ -316,7 +317,8 @@ trait WikiControllerBase extends ControllerBase { get("/:owner/:repository/wiki/_blob/*")(referrersOnly { repository => val path = multiParams("splat").head Using.resource(Git.open(getWikiRepositoryDir(repository.owner, repository.name))) { git => - val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve("master")) + val branch = getWikiBranch(repository.owner, repository.name) + val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch)) getPathObjectId(git, path, revCommit).map { objectId => responseRawFile(git, objectId, path, repository)