Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-10-31 18:46:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #2)Add action type "merge" for ISSUE_COMMENT.

Browse Source
This commit is contained in:
takezoe
2013-08-05 15:16:26 +09:00
parent b58c19b88b
commit 50cb59f569
4 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/app/PullRequestsController.scala
View File

@@ -105,7 +105,8 @@ trait PullRequestsControllerBase extends ControllerBase {
try {
// TODO mark issue as 'merged'
val loginAccount = context.loginAccount.get
createComment(repository.owner, repository.name, loginAccount.userName, issueId, "Closed", "close")
createComment(repository.owner, repository.name, loginAccount.userName, issueId, "Merge", "merge")
createComment(repository.owner, repository.name, loginAccount.userName, issueId, "Close", "close")
updateClosed(repository.owner, repository.name, issueId, true)
recordMergeActivity(repository.owner, repository.name, loginAccount.userName, issueId, form.message)