Browse Source

Show pull request selection even when unrelated branches (#11239) (#11283)

Fix #10525

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
tags/v1.11.5
guillep2k 4 years ago
parent
commit
ff7eaa1eb4
No account linked to committer's email address
2 changed files with 1 additions and 4 deletions
  1. 0
    3
      routers/repo/compare.go
  2. 1
    1
      templates/repo/diff/compare.tmpl

+ 0
- 3
routers/repo/compare.go View File

@@ -320,9 +320,6 @@ func PrepareCompareDiff(
compareInfo.Commits = models.ParseCommitsWithStatus(compareInfo.Commits, headRepo)
ctx.Data["Commits"] = compareInfo.Commits
ctx.Data["CommitCount"] = compareInfo.Commits.Len()
if ctx.Data["CommitCount"] == 0 {
ctx.Data["PageIsComparePull"] = false
}

if compareInfo.Commits.Len() == 1 {
c := compareInfo.Commits.Front().Value.(models.SignCommitWithStatuses)

+ 1
- 1
templates/repo/diff/compare.tmpl View File

@@ -59,7 +59,7 @@

{{if .IsNothingToCompare}}
<div class="ui segment">{{.i18n.Tr "repo.pulls.nothing_to_compare"}}</div>
{{else if .PageIsComparePull}}
{{else if and .PageIsComparePull (gt .CommitCount 0)}}
{{if .HasPullRequest}}
<div class="ui segment">
{{.i18n.Tr "repo.pulls.has_pull_request" $.RepoLink $.RepoRelPath .PullRequest.Index | Safe}}

Loading…
Cancel
Save