Merge pull request #203 from olivierdagenais/FixManualMergeUrls

Remove superfluous context.path
This commit is contained in:
Naoki Takezoe
2013-11-22 12:27:43 -08:00

View File

@@ -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
})