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

(refs #167)Add pusher info to WebHook

Browse Source
This commit is contained in:
takezoe
2013-10-31 02:07:54 +09:00
parent bd0ecd0a9d
commit 8ec4b52dda
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/service/WebHookService.scala
View File

@@ -74,14 +74,16 @@ trait WebHookService {
object WebHookService { object WebHookService {
case class WebHookPayload( case class WebHookPayload(
pusher: WebHookUser,
ref: String, ref: String,
commits: List[WebHookCommit], commits: List[WebHookCommit],
repository: WebHookRepository) repository: WebHookRepository)
object WebHookPayload { object WebHookPayload {
def apply(git: Git, refName: String, repositoryInfo: RepositoryInfo, def apply(git: Git, pusher: Account, refName: String, repositoryInfo: RepositoryInfo,
commits: List[CommitInfo], repositoryOwner: Account): WebHookPayload = commits: List[CommitInfo], repositoryOwner: Account): WebHookPayload =
WebHookPayload( WebHookPayload(
WebHookUser(pusher.fullName, pusher.mailAddress),
refName, refName,
commits.map { commit => commits.map { commit =>
val diffs = JGitUtil.getDiffs(git, commit.id, false) val diffs = JGitUtil.getDiffs(git, commit.id, false)

3
src/main/scala/servlet/GitRepositoryServlet.scala
View File

@@ -43,7 +43,7 @@ class GitRepositoryServlet extends GitServlet {
def getServletContext(): ServletContext = config.getServletContext def getServletContext(): ServletContext = config.getServletContext
def getServletName(): String = config.getServletName def getServletName(): String = config.getServletName
}); })
super.init(config) super.init(config)
} }
@@ -135,6 +135,7 @@ class CommitLogHook(owner: String, repository: String, userName: String, baseURL
if(webHookURLs.nonEmpty){ if(webHookURLs.nonEmpty){
val payload = WebHookPayload( val payload = WebHookPayload(
git, git,
getAccountByUserName(userName).get,
command.getRefName, command.getRefName,
getRepository(owner, repository, baseURL).get, getRepository(owner, repository, baseURL).get,
newCommits, newCommits,