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

Don't filter pull request target repositories

Browse Source 
because users who can access the forked repository should see the
original repositories and other forked repositories basically.
This commit is contained in:
Naoki Takezoe
2017-12-08 15:10:41 +09:00
parent fb175df851
commit 6bd58b0c45
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -382,12 +382,11 @@ trait PullRequestsControllerBase extends ControllerBase {
diffs, diffs,
((forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match { ((forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
case (Some(userName), Some(repositoryName)) => getRepository(userName, repositoryName) match { case (Some(userName), Some(repositoryName)) => getRepository(userName, repositoryName) match {
case Some(originRepository) => originRepository.repository :: getForkedRepositories(userName, repositoryName) case Some(x) => x.repository :: getForkedRepositories(userName, repositoryName)
case None => getForkedRepositories(userName, repositoryName) case None => getForkedRepositories(userName, repositoryName)
} }
case _ => forkedRepository.repository :: getForkedRepositories(forkedRepository.owner, forkedRepository.name) case _ => forkedRepository.repository :: getForkedRepositories(forkedRepository.owner, forkedRepository.name)
}).filter { repository => isReadable(repository, context.loginAccount) } }).map { repository => (repository.userName, repository.repositoryName) },
.map { repository => (repository.userName, repository.repositoryName) },
commits.flatten.map(commit => getCommitComments(forkedRepository.owner, forkedRepository.name, commit.id, false)).flatten.toList, commits.flatten.map(commit => getCommitComments(forkedRepository.owner, forkedRepository.name, commit.id, false)).flatten.toList,
originId, originId,
forkedId, forkedId,