(refs #2)Fix requested repository url in the merge guidance.

This commit is contained in:
takezoe
2013-07-15 14:40:50 +09:00
parent 159a5835e0
commit 5ea9150af8
2 changed files with 6 additions and 8 deletions

View File

@@ -46,17 +46,14 @@ trait PullRequestsControllerBase extends ControllerBase {
val issueId = params("id").toInt
getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
println(pullreq.mergeStartId)
println(pullreq.mergeEndId)
pulls.html.pullreq(
issue, pullreq,
getComments(owner, name, issueId.toInt),
(getCollaborators(owner, name) :+ owner).sorted,
getMilestones(owner, name),
hasWritePermission(owner, name, context.loginAccount),
repository)
repository,
s"${baseUrl}${context.path}/git/${pullreq.requestUserName}/${pullreq.requestRepositoryName}.git")
} getOrElse NotFound
})