From 9b2c3848d9a68c1a84712b5c5431721ec5b11e85 Mon Sep 17 00:00:00 2001 From: Bryant Hang Date: Tue, 27 Oct 2015 23:09:08 +0800 Subject: [PATCH] Update PullRequestsController.scala when the forked repository is the original repository(forkedRepository.repository.originRepositoryName&originUserName is None),then 404 will occur,so add the if to solve it. --- .../gitbucket/core/controller/PullRequestsController.scala | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala index fcddd279d..1becfbbcf 100644 --- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala +++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala @@ -284,6 +284,9 @@ trait PullRequestsControllerBase extends ControllerBase { originRepositoryName <- if(originOwner == forkedOwner) { // Self repository 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){ // Original repository forkedRepository.repository.originRepositoryName