Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-08 14:35:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/takezoe/gitbucket.git

Browse Source
This commit is contained in:
shimamoto
2013-08-08 20:59:27 +09:00
parent 6d453ea80b 5952648fae
commit 5462f0a7a1
22 changed files with 708 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,9 @@ trait DashboardControllerBase extends ControllerBase {
page,
countIssue(condition.copy(state = "open"), filterUser, true, repositories: _*),
countIssue(condition.copy(state = "closed"), filterUser, true, repositories: _*),
condition),
condition,
None,
false),
getPullRequestCountGroupByUser(condition.state == "closed", userName, None),
getRepositoryNamesOfUser(userName).map { RepoName =>
(userName, RepoName, counts.collectFirst { case (_, RepoName, count) => count }.getOrElse(0))

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

@@ -106,12 +106,16 @@ trait PullRequestsControllerBase extends ControllerBase {
try {
// mark issue as merged and close.
val loginAccount = context.loginAccount.get
createComment(repository.owner, repository.name, loginAccount.userName, issueId, "Merge", "merge")
createComment(repository.owner, repository.name, loginAccount.userName, issueId, form.message, "merge")
createComment(repository.owner, repository.name, loginAccount.userName, issueId, "Close", "close")
updateClosed(repository.owner, repository.name, issueId, true)
// record activity
recordMergeActivity(repository.owner, repository.name, loginAccount.userName, issueId, form.message)
// fetch pull request to working repository
// TODO apply ref comment
// fetch pull request to temporary working repository
val pullRequestBranchName = s"gitbucket-pullrequest-${issueId}"
git.fetch
@@ -301,7 +305,7 @@ trait PullRequestsControllerBase extends ControllerBase {
recordPullRequestActivity(repository.owner, repository.name, loginUserName, issueId, form.title)
redirect(s"/${repository.owner}/${repository.name}/pulls/${issueId}")
redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
})
/**