Fix 500 error viewing pull request when fork has pull requests disabled (#22512)

brechtvl · web-flow · commit aa87b3690081 · 2023-01-18T13:54:57.000-06:00
Swallow error just like in #20839, for the case where there is no protected branch. Fixes #20826 for me, though I can't tell if this now covers all cases.
diff --git a/services/pull/update.go b/services/pull/update.go
@@ -118,6 +118,9 @@ func IsUserAllowedToUpdate(ctx context.Context, pull *issues_model.PullRequest,
 		}
 		prUnit, err := pr.BaseRepo.GetUnit(ctx, unit.TypePullRequests)
 		if err != nil {
+			if repo_model.IsErrUnitTypeNotExist(err) {
+				return false, false, nil
+			}
 			log.Error("pr.BaseRepo.GetUnit(unit.TypePullRequests): %v", err)
 			return false, false, err
 		}

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,9 @@ func IsUserAllowedToUpdate(ctx context.Context, pull *issues_model.PullRequest,`
`118`	`118`	`}`
`119`	`119`	`prUnit, err := pr.BaseRepo.GetUnit(ctx, unit.TypePullRequests)`
`120`	`120`	`if err != nil {`
	`121`	`+ if repo_model.IsErrUnitTypeNotExist(err) {`
	`122`	`+ return false, false, nil`
	`123`	`+ }`
`121`	`124`	`log.Error("pr.BaseRepo.GetUnit(unit.TypePullRequests): %v", err)`
`122`	`125`	`return false, false, err`
`123`	`126`	`}`