diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala index ab89181..a34faca 100644 --- a/src/main/scala/app/PullRequestsController.scala +++ b/src/main/scala/app/PullRequestsController.scala @@ -106,12 +106,16 @@ try { // mark issue as merged and close. val loginAccount = context.loginAccount.get - createComment(repository.owner, repository.name, loginAccount.userName, issueId, "Merge", "merge") + createComment(repository.owner, repository.name, loginAccount.userName, issueId, form.message, "merge") createComment(repository.owner, repository.name, loginAccount.userName, issueId, "Close", "close") updateClosed(repository.owner, repository.name, issueId, true) + + // record activity recordMergeActivity(repository.owner, repository.name, loginAccount.userName, issueId, form.message) - // fetch pull request to working repository + // TODO apply ref comment + + // fetch pull request to temporary working repository val pullRequestBranchName = s"gitbucket-pullrequest-${issueId}" git.fetch diff --git a/src/main/twirl/issues/commentlist.scala.html b/src/main/twirl/issues/commentlist.scala.html index 5c0bc52..ecff874 100644 --- a/src/main/twirl/issues/commentlist.scala.html +++ b/src/main/twirl/issues/commentlist.scala.html @@ -6,7 +6,7 @@ @import context._ @import view.helpers._ @comments.map { comment => - @if(comment.action != "close" && comment.action != "reopen" && comment.action != "merge"){ + @if(comment.action != "close" && comment.action != "reopen"){