diff --git a/src/main/twirl/issues/commentlist.scala.html b/src/main/twirl/issues/commentlist.scala.html
index 7957ee7..2edbde9 100644
--- a/src/main/twirl/issues/commentlist.scala.html
+++ b/src/main/twirl/issues/commentlist.scala.html
@@ -1,6 +1,8 @@
-@(comments: List[model.IssueComment],
+@(issue: model.Issue,
+ comments: List[model.IssueComment],
hasWritePermission: Boolean,
- repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+ repository: service.RepositoryService.RepositoryInfo,
+ pullreq: Option[model.PullRequest] = None)(implicit context: app.Context)
@import context._
@import view.helpers._
@comments.map { comment =>
@@ -26,14 +28,20 @@
Merged
@avatar(comment.commentedUserName, 20)
-
@comment.commentedUserName merged the pull request @datetime(comment.registeredDate)
+
@comment.commentedUserName merged commit
@pullreq.map(_.commitIdTo.substring(0, 7))
+
@pullreq.map(_.requestUserName):@pullreq.map(_.requestBranch) to
@pullreq.map(_.userName):@pullreq.map(_.branch)
+ @datetime(comment.registeredDate)
}
@if(comment.action == "close" || comment.action == "close_comment"){
}
@if(comment.action == "reopen" || comment.action == "reopen_comment"){
diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html
index 5742215..764a9fc 100644
--- a/src/main/twirl/issues/issue.scala.html
+++ b/src/main/twirl/issues/issue.scala.html
@@ -18,7 +18,7 @@
@issuedetail(issue, comments, collaborators, milestones, hasWritePermission, repository)
- @commentlist(comments, hasWritePermission, repository)
+ @commentlist(issue, comments, hasWritePermission, repository)
@commentform(issue, hasWritePermission, repository)
diff --git a/src/main/twirl/pulls/discussion.scala.html b/src/main/twirl/pulls/discussion.scala.html
index 76bb332..e55aa25 100644
--- a/src/main/twirl/pulls/discussion.scala.html
+++ b/src/main/twirl/pulls/discussion.scala.html
@@ -12,8 +12,7 @@
@issues.html.issuedetail(issue, comments, collaborators, milestones, hasWritePermission, repository)
- @issues.html.commentlist(comments, hasWritePermission, repository)
-
+ @issues.html.commentlist(issue, comments, hasWritePermission, repository, Some(pullreq))
@if(hasWritePermission && !issue.closed){