Skip to content

Commit b9742b3

Browse files
CaiCandongGiteaBot
authored andcommitted
Fix being unable to use a repo that prohibits accepting PRs as a PR source. (go-gitea#26785)
## Description Sometimes, we need to use an upstream mirror repository to update the current development repository, but mirror repositories are prohibited from PR. It should not appear in `merge to,` but it can appear in `pull from.` Fix go-gitea#24585 go-gitea#26193 go-gitea#26781 Related go-gitea#24183 Many thanks to @apnote for assisting me in reproducing this bug! ## ScreenShot --- ### Before <img src="https://github.com/go-gitea/gitea/assets/50507092/3d76c376-1f54-45b9-80c9-6ba8319d6a9a" width="400px"> <img src="https://github.com/go-gitea/gitea/assets/50507092/fbfd9f7f-421f-4a2e-9a3e-f2958bbf3312" width="400px"> ### After <img src="https://github.com/go-gitea/gitea/assets/50507092/e6984524-4f61-4310-b795-4d8598bd8963" width="400px"> <img src="https://github.com/go-gitea/gitea/assets/50507092/04065b44-78d7-4721-bf31-0f1674150727" width="400px">
1 parent 087df92 commit b9742b3

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

routers/web/repo/compare.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ func ParseCompareInfo(ctx *context.Context) *CompareInfo {
459459
rootRepo.ID != ci.HeadRepo.ID &&
460460
rootRepo.ID != baseRepo.ID {
461461
canRead := access_model.CheckRepoUnitUser(ctx, rootRepo, ctx.Doer, unit.TypeCode)
462-
if canRead && rootRepo.AllowsPulls() {
462+
if canRead {
463463
ctx.Data["RootRepo"] = rootRepo
464464
if !fileOnly {
465465
branches, tags, err := getBranchesAndTagsForRepo(ctx, rootRepo)

templates/repo/diff/compare.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<div class="item" data-url="{{$.OwnForkRepo.Link}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{PathEscapeSegments $.HeadBranch}}">{{$OwnForkCompareName}}:{{.}}</div>
7878
{{end}}
7979
{{end}}
80-
{{if .RootRepo}}
80+
{{if and .RootRepo .RootRepo.AllowsPulls}}
8181
{{range .RootRepoBranches}}
8282
<div class="item" data-url="{{$.RootRepo.Link}}/compare/{{PathEscapeSegments .}}{{$.CompareSeparator}}{{PathEscape $.HeadUser.Name}}/{{PathEscape $.HeadRepo.Name}}:{{PathEscapeSegments $.HeadBranch}}">{{$RootRepoCompareName}}:{{.}}</div>
8383
{{end}}

0 commit comments

Comments
 (0)