Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-02 19:45:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #2)Close issue when pull request is merged.

Browse Source
This commit is contained in:
takezoe
2013-07-15 14:17:26 +09:00
parent 78d48c8be3
commit 159a5835e0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,14 +112,16 @@ trait PullRequestsControllerBase extends ControllerBase {
val git = Git.cloneRepository.setDirectory(tmpdir).setURI(remote.toURI.toString).call val git = Git.cloneRepository.setDirectory(tmpdir).setURI(remote.toURI.toString).call
try { try {
// TODO merge and close issue
val (commits, diffs) = getCompareInfo(repository.owner, repository.name, pullreq.branch, val (commits, diffs) = getCompareInfo(repository.owner, repository.name, pullreq.branch,
pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.requestBranch) pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.requestBranch)
mergePullRequest(repository.owner, repository.name, issueId, mergePullRequest(repository.owner, repository.name, issueId,
git.getRepository.resolve("master").getName, git.getRepository.resolve("master").getName,
commits.head.head.id) commits.head.head.id)
// TODO mark issue as 'merged'
val loginAccount = context.loginAccount.get val loginAccount = context.loginAccount.get
createComment(repository.owner, repository.name, loginAccount.userName, issueId, "Closed", Some("close"))
updateClosed(repository.owner, repository.name, issueId, true)
recordMergeActivity(repository.owner, repository.name, loginAccount.userName, issueId, form.message) recordMergeActivity(repository.owner, repository.name, loginAccount.userName, issueId, form.message)
git.checkout.setName(pullreq.branch).call git.checkout.setName(pullreq.branch).call