diff --git a/src/main/scala/gitbucket/core/controller/ApiController.scala b/src/main/scala/gitbucket/core/controller/ApiController.scala index 5c3d554..2044558 100644 --- a/src/main/scala/gitbucket/core/controller/ApiController.scala +++ b/src/main/scala/gitbucket/core/controller/ApiController.scala @@ -77,7 +77,7 @@ /** * https://developer.github.com/v3/#root-endpoint */ - get("/api/v3/") { + get("/api/v3") { JsonFormat(ApiEndPoint()) } diff --git a/src/main/scala/gitbucket/core/controller/ControllerBase.scala b/src/main/scala/gitbucket/core/controller/ControllerBase.scala index d7bde61..b4ad4a7 100644 --- a/src/main/scala/gitbucket/core/controller/ControllerBase.scala +++ b/src/main/scala/gitbucket/core/controller/ControllerBase.scala @@ -43,6 +43,15 @@ contentType = formats("json") } + override def requestPath(uri: String, idx: Int): String = { + val path = super.requestPath(uri, idx) + if(path != "/" && path.endsWith("/")){ + path.substring(0, path.length - 1) + } else { + path + } + } + override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = try { val httpRequest = request.asInstanceOf[HttpServletRequest] val context = request.getServletContext.getContextPath diff --git a/src/main/scala/gitbucket/core/controller/WikiController.scala b/src/main/scala/gitbucket/core/controller/WikiController.scala index d93292d..5349fb9 100644 --- a/src/main/scala/gitbucket/core/controller/WikiController.scala +++ b/src/main/scala/gitbucket/core/controller/WikiController.scala @@ -109,7 +109,7 @@ val Array(from, to) = params("commitId").split("\\.\\.\\.") if(revertWikiPage(repository.owner, repository.name, from, to, context.loginAccount.get, None)){ - redirect(s"/${repository.owner}/${repository.name}/wiki/") + redirect(s"/${repository.owner}/${repository.name}/wiki") } else { flash += "info" -> "This patch was not able to be reversed." redirect(s"/${repository.owner}/${repository.name}/wiki/_compare/${from}...${to}")