diff --git a/src/main/scala/gitbucket/core/service/MergeService.scala b/src/main/scala/gitbucket/core/service/MergeService.scala index 28aa87b..695c964 100644 --- a/src/main/scala/gitbucket/core/service/MergeService.scala +++ b/src/main/scala/gitbucket/core/service/MergeService.scala @@ -215,6 +215,13 @@ .foreach { issueId => getIssue(localRepository.owner, localRepository.name, issueId.toString).foreach { issue => callIssuesWebHook("closed", localRepository, issue, loginAccount, settings) + recordCloseIssueActivity( + localRepository.owner, + localRepository.name, + localUserName, + issue.issueId, + issue.title + ) PluginRegistry().getIssueHooks .foreach( _.closedByCommitComment(issue, localRepository, commit.fullMessage, loginAccount) @@ -337,6 +344,13 @@ ).foreach { issueId => getIssue(repository.owner, repository.name, issueId.toString).foreach { issue => callIssuesWebHook("closed", repository, issue, loginAccount, context.settings) + recordCloseIssueActivity( + repository.owner, + repository.name, + loginAccount.userName, + issue.issueId, + issue.title + ) PluginRegistry().getIssueHooks .foreach(_.closedByCommitComment(issue, repository, commit.fullMessage, loginAccount)) } @@ -351,6 +365,13 @@ ).foreach { issueId => getIssue(repository.owner, repository.name, issueId.toString).foreach { issue => callIssuesWebHook("closed", repository, issue, loginAccount, context.settings) + recordCloseIssueActivity( + repository.owner, + repository.name, + loginAccount.userName, + issue.issueId, + issue.title + ) PluginRegistry().getIssueHooks .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount)) } @@ -359,6 +380,13 @@ .foreach { issueId => getIssue(repository.owner, repository.name, issueId.toString).foreach { issue => callIssuesWebHook("closed", repository, issue, loginAccount, context.settings) + recordCloseIssueActivity( + repository.owner, + repository.name, + loginAccount.userName, + issue.issueId, + issue.title + ) PluginRegistry().getIssueHooks .foreach(_.closedByCommitComment(issue, repository, issueContent, loginAccount)) } diff --git a/src/main/scala/gitbucket/core/service/RepositoryCommitFileService.scala b/src/main/scala/gitbucket/core/service/RepositoryCommitFileService.scala index 9929199..06c080c 100644 --- a/src/main/scala/gitbucket/core/service/RepositoryCommitFileService.scala +++ b/src/main/scala/gitbucket/core/service/RepositoryCommitFileService.scala @@ -186,6 +186,13 @@ closeIssuesFromMessage(message, committerName, repository.owner, repository.name).foreach { issueId => getIssue(repository.owner, repository.name, issueId.toString).foreach { issue => callIssuesWebHook("closed", repository, issue, loginAccount, settings) + recordCloseIssueActivity( + repository.owner, + repository.name, + loginAccount.userName, + issue.issueId, + issue.title + ) PluginRegistry().getIssueHooks .foreach(_.closedByCommitComment(issue, repository, message, loginAccount)) } diff --git a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala index acc6f77..efb6735 100644 --- a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala @@ -322,6 +322,13 @@ closeIssuesFromMessage(commit.fullMessage, pusher, owner, repository).foreach { issueId => getIssue(owner, repository, issueId.toString).foreach { issue => callIssuesWebHook("closed", repositoryInfo, issue, pusherAccount, settings) + recordCloseIssueActivity( + owner, + repository, + pusherAccount.userName, + issue.issueId, + issue.title + ) PluginRegistry().getIssueHooks .foreach(_.closedByCommitComment(issue, repositoryInfo, commit.fullMessage, pusherAccount)) }