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

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

@@ -503,11 +503,6 @@ trait PullRequestsControllerBase extends ControllerBase {
}) })
ajaxGet("/:owner/:repository/pulls/proposals")(readableUsersOnly { repository => ajaxGet("/:owner/:repository/pulls/proposals")(readableUsersOnly { repository =>
(for {
parentUserName <- repository.repository.parentUserName
parentRepoName <- repository.repository.parentRepositoryName
parentRepository <- getRepository(parentUserName, parentRepoName).orElse(Some(repository))
} yield {
val branches = JGitUtil.getBranches( val branches = JGitUtil.getBranches(
owner = repository.owner, owner = repository.owner,
name = repository.name, name = repository.name,
@@ -519,8 +514,17 @@ trait PullRequestsControllerBase extends ControllerBase {
.map(_.name) .map(_.name)
.reverse .reverse
html.proposals(branches, parentRepository, repository) val targetRepository = (for {
}).getOrElse(NotFound()) parentUserName <- repository.repository.parentUserName
parentRepoName <- repository.repository.parentRepositoryName
parentRepository <- getRepository(parentUserName, parentRepoName).orElse(Some(repository))
} yield {
parentRepository
}).getOrElse {
repository
}
html.proposals(branches, targetRepository, repository)
}) })
/** /**