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

Merge pull request #612 from team-lab/fix/update-pullrequest-on-commit-by-online-editor

Browse Source 
fix/update pullrequest when file edited by online editor
This commit is contained in:
Naoki Takezoe
2015-01-31 18:19:46 +09:00
parent 15118ca5c1 06b5b92673
commit 6e4f6da633
4 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/scala/service/PullRequestService.scala
View File

@@ -3,6 +3,7 @@ package service
import model.Profile._
import profile.simple._
import model.{PullRequest, Issue}
import util.JGitUtil
trait PullRequestService { self: IssuesService =>
import PullRequestService._
@@ -81,6 +82,18 @@ trait PullRequestService { self: IssuesService =>
.map { case (t1, t2) => t1 }
.list
/**
* Fetch pull request contents into refs/pull/${issueId}/head and update pull request table.
*/
def updatePullRequests(owner: String, repository: String, branch: String)(implicit s: Session): Unit =
getPullRequestsByRequest(owner, repository, branch, false).foreach { pullreq =>
if(Repositories.filter(_.byRepository(pullreq.userName, pullreq.repositoryName)).exists.run){
val (commitIdTo, commitIdFrom) = JGitUtil.updatePullRequest(
pullreq.userName, pullreq.repositoryName, pullreq.branch, pullreq.issueId,
pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.requestBranch)
updateCommitId(pullreq.userName, pullreq.repositoryName, pullreq.issueId, commitIdTo, commitIdFrom)
}
}
}
object PullRequestService {