From 2fe79baed8538b99c3d27de9e0f610e35e641cc7 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Wed, 1 Jun 2016 22:06:00 +0900 Subject: [PATCH] Close issue by pull request title --- .../gitbucket/core/controller/PullRequestsController.scala | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala index 670348870..ed5810bc9 100644 --- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala +++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala @@ -202,7 +202,7 @@ trait PullRequestsControllerBase extends ControllerBase { // close issue by commit message if(pullreq.requestBranch == repository.repository.defaultBranch){ - commits.map{ commit => + commits.map { commit => closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name) } } @@ -255,10 +255,7 @@ trait PullRequestsControllerBase extends ControllerBase { commits.flatten.foreach { commit => closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name) } - issue.content match { - case Some(content) => closeIssuesFromMessage(content, loginAccount.userName, owner, name) - case _ => - } + closeIssuesFromMessage(issue.title + " " + issue.content.getOrElse(""), loginAccount.userName, owner, name) closeIssuesFromMessage(form.message, loginAccount.userName, owner, name) }