diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala index 1758986..01739d3 100644 --- a/src/main/scala/app/PullRequestsController.scala +++ b/src/main/scala/app/PullRequestsController.scala @@ -46,17 +46,14 @@ 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 }) diff --git a/src/main/twirl/pulls/pullreq.scala.html b/src/main/twirl/pulls/pullreq.scala.html index 034e086..fe84a35 100644 --- a/src/main/twirl/pulls/pullreq.scala.html +++ b/src/main/twirl/pulls/pullreq.scala.html @@ -4,7 +4,8 @@ collaborators: List[String], milestones: List[model.Milestone], hasWritePermission: Boolean, - repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) + repository: service.RepositoryService.RepositoryInfo, + requestRepositoryUrl: String)(implicit context: app.Context) @import context._ @import view.helpers._ @html.main("%s - Issue #%d - %s/%s".format(issue.title, issue.issueId, repository.owner, repository.name)){ @@ -120,7 +121,7 @@
Step 1: Check out a new branch to test the changes — run this from your project directory @@ -129,7 +130,7 @@
Step 2: Bring in @{pullreq.requestUserName}'s changes and test
-git pull https://github.com/@{pullreq.requestUserName}/@{repository.name}.git @{pullreq.requestBranch}+
git pull @{requestRepositoryUrl} @{pullreq.requestBranch}
Step 3: Merge the changes and update the server