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 caf78f1bf..1d0d9ca0f 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
+ }
+
- Discussion
- Commits @commits.flatten.size
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index d78ec7b4c..03a039ddd 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -616,6 +616,16 @@ div.issue-comment-action {
border-radius: 5px;
}
+/****************************************************************************/
+/* Pull Request */
+/****************************************************************************/
+div.pullreq-info {
+ border: 1px solid #ddd;
+ background-color: #f8f8f8;
+ margin-bottom: 10px;
+ padding: 8px;
+}
+
/****************************************************************************/
/* Wiki */
/****************************************************************************/