Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-05-06 19:36:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

add activity record for issue closing by comment (#2510)

Browse Source
This commit is contained in:
onukura
2020-08-18 15:27:55 +09:00
committed by GitHub
parent 36989c38d4
commit 308bda2050
3 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/scala/gitbucket/core/service/MergeService.scala
View File

@@ -215,6 +215,13 @@ trait MergeService {
.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 @@ trait MergeService {
).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 @@ trait MergeService {
).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 @@ trait MergeService {
.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))
}

7
src/main/scala/gitbucket/core/service/RepositoryCommitFileService.scala
View File

@@ -186,6 +186,13 @@ trait RepositoryCommitFileService {
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))
}

7
src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
View File

@@ -322,6 +322,13 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
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))
}