finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix branch page pull request title and link error (#10092)

Browse source 
* Fix branch page pull request title and link error

* Fix ui
This commit is contained in:
Lunny Xiao 2020-02-01 21:54:25 +08:00 • committed by GitHub
parent 107a694fd6
commit 3ccd271081
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
routers/repo/branch.go
View file

@ -239,6 +239,7 @@ func loadBranches(ctx *context.Context) []*Branch {
} else {
repoIDToRepo[pr.BaseRepoID] = pr.BaseRepo
}
pr.Issue.Repo = pr.BaseRepo
if pr.HasMerged {
baseGitRepo, ok := repoIDToGitRepo[pr.BaseRepoID]
@ -261,7 +262,6 @@ func loadBranches(ctx *context.Context) []*Branch {
mergeMovedOn = true
}
}
}
isIncluded := divergence.Ahead == 0 && ctx.Repo.Repository.DefaultBranch != branchName