From ca814e2c08da4cd183ff77f6d2fe5b07bc501ad2 Mon Sep 17 00:00:00 2001 From: Keiichi Watanabe Date: Tue, 30 Aug 2016 19:00:10 +0900 Subject: [PATCH] fix path parameter in get-contents API --- .../gitbucket/core/controller/ApiController.scala | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/ApiController.scala b/src/main/scala/gitbucket/core/controller/ApiController.scala index dd249c4ab..9a2f2a4e5 100644 --- a/src/main/scala/gitbucket/core/controller/ApiController.scala +++ b/src/main/scala/gitbucket/core/controller/ApiController.scala @@ -109,14 +109,13 @@ trait ApiControllerBase extends ControllerBase { * https://developer.github.com/v3/repos/contents/#get-contents */ get("/api/v3/repos/:owner/:repo/contents/*")(referrersOnly { repository => - val (id, path) = repository.splitPath(multiParams("splat").head) + val path = multiParams("splat").head match { + case s if s.isEmpty => "." + case s => s + } val refStr = params.getOrElse("ref", repository.repository.defaultBranch) using(Git.open(getRepositoryDir(params("owner"), params("repo")))){ git => - if (path.isEmpty) { - JsonFormat(getFileList(git, refStr, ".").map{f => ApiContents(f)}) - } else { - JsonFormat(getFileList(git, refStr, path).map{f => ApiContents(f)}) - } + JsonFormat(getFileList(git, refStr, path).map{f => ApiContents(f)}) } })