diff --git a/src/main/twirl/pulls/compare.scala.html b/src/main/twirl/pulls/compare.scala.html index fef6a61..45520fc 100644 --- a/src/main/twirl/pulls/compare.scala.html +++ b/src/main/twirl/pulls/compare.scala.html @@ -14,7 +14,7 @@ @import org.eclipse.jgit.diff.DiffEntry.ChangeType @html.main("Pull Requests - " + repository.owner + "/" + repository.name){ @html.header("pulls", repository) -
+
Edit @originRepository.owner:@originId ... @forkedRepository.owner:@forkedId diff --git a/src/main/twirl/pulls/pullreq.scala.html b/src/main/twirl/pulls/pullreq.scala.html index caf78f1..1d0d9ca 100644 --- a/src/main/twirl/pulls/pullreq.scala.html +++ b/src/main/twirl/pulls/pullreq.scala.html @@ -14,6 +14,24 @@ @import view.helpers._ @html.main("%s - Pull Request #%d - %s/%s".format(issue.title, issue.issueId, repository.owner, repository.name)){ @html.header("pulls", repository) +
+ @if(issue.closed) { + @comments.find(_.action == "merge").map{ comment => + Merged + @comment.commentedUserName merged @commits.flatten.size @plural(commits.flatten.size, "commit") + into @pullreq.requestUserName:@pullreq.requestBranch from @pullreq.userName:@pullreq.branch + at @datetime(comment.registeredDate) + }.getOrElse { + Closed + @issue.openedUserName wants to merge @commits.flatten.size @plural(commits.flatten.size, "commit") + into @pullreq.requestUserName:@pullreq.requestBranch from @pullreq.userName:@pullreq.branch + } + } else { + Open + @issue.openedUserName wants to merge @commits.flatten.size @plural(commits.flatten.size, "commit") + into @pullreq.requestUserName:@pullreq.requestBranch from @pullreq.userName:@pullreq.branch + } +