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

Show pull request proposals for the current repository

Browse Source 
if the repository doesn't have a parent repository.
This commit is contained in:
Naoki Takezoe
2017-12-12 00:39:30 +09:00
parent 3a540aa660
commit 70f40846bb
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/scala/gitbucket/core/controller/PullRequestsController.scala
View File

@@ -503,24 +503,28 @@ trait PullRequestsControllerBase extends ControllerBase {
}) })
ajaxGet("/:owner/:repository/pulls/proposals")(readableUsersOnly { repository => ajaxGet("/:owner/:repository/pulls/proposals")(readableUsersOnly { repository =>
(for { val branches = JGitUtil.getBranches(
owner = repository.owner,
name = repository.name,
defaultBranch = repository.repository.defaultBranch,
origin = repository.repository.originUserName.isEmpty
)
.filter(x => x.mergeInfo.map(_.ahead).getOrElse(0) > 0 && x.mergeInfo.map(_.behind).getOrElse(0) == 0)
.sortBy(br => (br.mergeInfo.isEmpty, br.commitTime))
.map(_.name)
.reverse
val targetRepository = (for {
parentUserName <- repository.repository.parentUserName parentUserName <- repository.repository.parentUserName
parentRepoName <- repository.repository.parentRepositoryName parentRepoName <- repository.repository.parentRepositoryName
parentRepository <- getRepository(parentUserName, parentRepoName).orElse(Some(repository)) parentRepository <- getRepository(parentUserName, parentRepoName).orElse(Some(repository))
} yield { } yield {
val branches = JGitUtil.getBranches( parentRepository
owner = repository.owner, }).getOrElse {
name = repository.name, repository
defaultBranch = repository.repository.defaultBranch, }
origin = repository.repository.originUserName.isEmpty
)
.filter(x => x.mergeInfo.map(_.ahead).getOrElse(0) > 0 && x.mergeInfo.map(_.behind).getOrElse(0) == 0)
.sortBy(br => (br.mergeInfo.isEmpty, br.commitTime))
.map(_.name)
.reverse
html.proposals(branches, parentRepository, repository) html.proposals(branches, targetRepository, repository)
}).getOrElse(NotFound())
}) })
/** /**