diff --git a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala index 52e223c..c505fba 100644 --- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala +++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala @@ -642,7 +642,7 @@ case _ => forkedRepository.repository :: getForkedRepositories(forkedRepository.owner, forkedRepository.name) }).map { repository => - (repository.userName, repository.repositoryName) + (repository.userName, repository.repositoryName, repository.defaultBranch) }, commits.flatten .map(commit => getCommitComments(forkedRepository.owner, forkedRepository.name, commit.id, false)) diff --git a/src/main/twirl/gitbucket/core/pulls/compare.scala.html b/src/main/twirl/gitbucket/core/pulls/compare.scala.html index 92603b1..ed18c16 100644 --- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html @@ -1,7 +1,7 @@ @(title: String, commits: Seq[Seq[gitbucket.core.util.JGitUtil.CommitInfo]], diffs: Seq[gitbucket.core.util.JGitUtil.DiffInfo], - members: List[(String, String)], + members: List[(String, String, String)], comments: List[gitbucket.core.model.Comment], originId: String, forkedId: String, @@ -22,8 +22,8 @@
@gitbucket.core.helper.html.dropdown(originRepository.owner + "/" + originRepository.name, "base fork", filter=("origin_repo", "Find Repository...")) { - @members.map { case (owner, name) => -
  • @gitbucket.core.helper.html.checkicon(owner == originRepository.owner) @owner/@name
  • + @members.map { case (owner, name, defaultBranch) => +
  • @gitbucket.core.helper.html.checkicon(owner == originRepository.owner) @owner/@name
  • } } @gitbucket.core.helper.html.dropdown(originId, "base", filter=("origin_branch", "Find Branch...")) { @@ -33,8 +33,8 @@ } ... @gitbucket.core.helper.html.dropdown(forkedRepository.owner + "/" + forkedRepository.name, "head fork", filter=("forked_repo", "Find Repository...")) { - @members.map { case (owner, name) => -
  • @gitbucket.core.helper.html.checkicon(owner == forkedRepository.owner) @owner/@name
  • + @members.map { case (owner, name, defaultBranch) => +
  • @gitbucket.core.helper.html.checkicon(owner == forkedRepository.owner) @owner/@name
  • } } @gitbucket.core.helper.html.dropdown(forkedId, "compare", filter=("forked_branch", "Find Branch...")) { @@ -170,7 +170,37 @@ }