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

Fix refs commit log and web hook.

Browse Source
This commit is contained in:
takezoe
2014-01-04 04:05:25 +09:00
parent 1da7173f27
commit 0e7280585a
4 changed files with 36 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/scala/app/IndexController.scala
View File

@@ -2,7 +2,6 @@ package app
import util._
import service._
import jp.sf.amateras.scalatra.forms._
class IndexController extends IndexControllerBase
with RepositoryService with SystemSettingsService with ActivityService with AccountService

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

@@ -91,7 +91,7 @@ trait PullRequestsControllerBase extends ControllerBase {
ajaxGet("/:owner/:repository/pull/:id/mergeguide")(collaboratorsOnly { repository =>
params("id").toIntOpt.flatMap{ issueId =>
val owner = repository.owner
val name = repository.name
val name = repository.name
getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
pulls.html.mergeguide(
checkConflictInPullRequest(owner, name, pullreq.branch, pullreq.requestUserName, name, pullreq.requestBranch, issueId),
@@ -104,7 +104,7 @@ trait PullRequestsControllerBase extends ControllerBase {
post("/:owner/:repository/pull/:id/merge", mergeForm)(collaboratorsOnly { (form, repository) =>
params("id").toIntOpt.flatMap { issueId =>
val owner = repository.owner
val name = repository.name
val name = repository.name
LockUtil.lock(s"${owner}/${name}/merge"){
getPullRequest(owner, name, issueId).map { case (issue, pullreq) =>
using(Git.open(getRepositoryDir(owner, name))) { git =>
@@ -165,17 +165,12 @@ trait PullRequestsControllerBase extends ControllerBase {
}
// call web hook
val webHookURLs = getWebHookURLs(owner, name)
if(webHookURLs.nonEmpty){
val payload = WebHookPayload(
git,
loginAccount,
mergeBaseRefName,
repository,
commits.flatten.toList,
getAccountByUserName(owner).get)
callWebHook(owner, name, webHookURLs, payload)
getWebHookURLs(owner, name) match {
case webHookURLs if(webHookURLs.nonEmpty) =>
for(ownerAccount <- getAccountByUserName(owner)){
callWebHook(owner, name, webHookURLs,
WebHookPayload(git, loginAccount, mergeBaseRefName, repository, commits.flatten.toList, ownerAccount))
}
}
// notifications
@@ -427,7 +422,7 @@ trait PullRequestsControllerBase extends ControllerBase {
val commits = newGit.log.addRange(oldId, newId).call.iterator.asScala.map { revCommit =>
new CommitInfo(revCommit)
}.toList.splitWith{ (commit1, commit2) =>
}.toList.splitWith { (commit1, commit2) =>
view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
}

17
src/main/scala/app/RepositorySettingsController.scala
View File

@@ -138,17 +138,12 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
.setMaxCount(3)
.call.iterator.asScala.map(new CommitInfo(_))
val webHookURLs = getWebHookURLs(repository.owner, repository.name)
if(webHookURLs.nonEmpty){
val owner = getAccountByUserName(repository.owner).get
callWebHook(repository.owner, repository.name, webHookURLs,
WebHookPayload(
git,
owner,
"refs/heads/" + repository.repository.defaultBranch,
repository,
commits.toList,
owner))
getWebHookURLs(repository.owner, repository.name) match {
case webHookURLs if(webHookURLs.nonEmpty) =>
for(ownerAccount <- getAccountByUserName(repository.owner)){
callWebHook(repository.owner, repository.name, webHookURLs,
WebHookPayload(git, ownerAccount, "refs/heads/" + repository.repository.defaultBranch, repository, commits.toList, ownerAccount))
}
}
flash += "info" -> "Test payload deployed!"