From 8381e8122abe0c6f796558ec380eb0f206438b42 Mon Sep 17 00:00:00 2001 From: Olivier Dagenais Date: Tue, 19 Nov 2013 11:48:29 -0500 Subject: [PATCH] Remove superfluous context.path It was generating URLs that look like http://server.example.com/gitbucket/gitbucket/git/user/repo.git (notice the extra "/gitbucket"?) when the WAR was deployed in Tomcat. --- src/main/scala/app/PullRequestsController.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala index deb4c9164..ea8afd567 100644 --- a/src/main/scala/app/PullRequestsController.scala +++ b/src/main/scala/app/PullRequestsController.scala @@ -98,7 +98,7 @@ trait PullRequestsControllerBase extends ControllerBase { pulls.html.mergeguide( checkConflictInPullRequest(owner, name, pullreq.branch, pullreq.requestUserName, name, pullreq.requestBranch, issueId), pullreq, - s"${baseUrl}${context.path}/git/${pullreq.requestUserName}/${pullreq.requestRepositoryName}.git") + s"${baseUrl}/git/${pullreq.requestUserName}/${pullreq.requestRepositoryName}.git") } } getOrElse NotFound })