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

Merge pull request #1984 from kounoike/pr-call-webhook-when-close-by-comment

Browse Source 
call issue closed webhook when pushed commit contains keywords
This commit is contained in:
Naoki Takezoe
2018-04-29 09:36:59 +09:00
committed by GitHub
parent 7c0d0be876 921298cf92
commit 8f4744f93d
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -700,11 +700,12 @@ trait IssuesService {
def closeIssuesFromMessage(message: String, userName: String, owner: String, repository: String)(
implicit s: Session
): Unit = {
extractCloseId(message).foreach { issueId =>
for (issue <- getIssue(owner, repository, issueId) if !issue.closed) {
): Seq[Int] = {
extractCloseId(message).flatMap { issueId =>
for (issue <- getIssue(owner, repository, issueId) if !issue.closed) yield {
createComment(owner, repository, userName, issue.issueId, "Close", "close")
updateClosed(owner, repository, issue.issueId, true)
issue.issueId
}
}
}

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

@@ -296,7 +296,13 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
createIssueComment(owner, repository, commit)
// close issues
if (refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE) {
closeIssuesFromMessage(commit.fullMessage, pusher, owner, repository)
getAccountByUserName(pusher).map { pusherAccount =>
closeIssuesFromMessage(commit.fullMessage, pusher, owner, repository).foreach { issueId =>
getIssue(owner, repository, issueId.toString).map { issue =>
callIssuesWebHook("closed", repositoryInfo, issue, baseUrl, pusherAccount)
}
}
}
}
}
Some(commit)