diff --git a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala index 8f353c0..1847d54 100644 --- a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala @@ -347,9 +347,9 @@ // set PR as merged val pulls = getPullRequestsByBranch(owner, repository, branchName, Some(false)) pulls.foreach { pull => - if (commits.find { c => + if (commits.exists { c => c.id == pull.commitIdTo - }.isDefined) { + }) { markMergeAndClosePullRequest(pusher, owner, repository, pull) getAccountByUserName(pusher).foreach { pusherAccount => callPullRequestWebHook("closed", repositoryInfo, pull.issueId, pusherAccount, settings)