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

Merge pull request #961 from superhj1987/master

Browse Source 
Update PullRequestsController.scala
This commit is contained in:
Naoki Takezoe
2015-10-29 01:06:06 +09:00
parent 34272cb4c4 f767a55350
commit c18f8fd87b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -294,6 +294,9 @@ trait PullRequestsControllerBase extends ControllerBase {
originRepositoryName <- if(originOwner == forkedOwner) { originRepositoryName <- if(originOwner == forkedOwner) {
// Self repository // Self repository
Some(forkedRepository.name) Some(forkedRepository.name)
}else if(forkedRepository.repository.originUserName == None){
// when ForkedRepository is the original repository
getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_._1 == originOwner).map(_._2)
} else if(Some(originOwner) == forkedRepository.repository.originUserName){ } else if(Some(originOwner) == forkedRepository.repository.originUserName){
// Original repository // Original repository
forkedRepository.repository.originRepositoryName forkedRepository.repository.originRepositoryName