Merge branch 'main' into fix/35763-project-page-title

GiteaBot · web-flow · commit 4b51a659769e · 2025-11-10T05:23:58.000+08:00
diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go
@@ -897,7 +897,7 @@ func EditBranchProtection(ctx *context.APIContext) {
 	} else {
 		whitelistUsers = protectBranch.WhitelistUserIDs
 	}
-	if form.ForcePushAllowlistDeployKeys != nil {
+	if form.ForcePushAllowlistUsernames != nil {
 		forcePushAllowlistUsers, err = user_model.GetUserIDsByNames(ctx, form.ForcePushAllowlistUsernames, false)
 		if err != nil {
 			if user_model.IsErrUserNotExist(err) {

Original file line number	Diff line number	Diff line change
`@@ -897,7 +897,7 @@ func EditBranchProtection(ctx *context.APIContext) {`
`897`	`897`	`} else {`
`898`	`898`	`whitelistUsers = protectBranch.WhitelistUserIDs`
`899`	`899`	`}`
`900`		`- if form.ForcePushAllowlistDeployKeys != nil {`
	`900`	`+ if form.ForcePushAllowlistUsernames != nil {`
`901`	`901`	`forcePushAllowlistUsers, err = user_model.GetUserIDsByNames(ctx, form.ForcePushAllowlistUsernames, false)`
`902`	`902`	`if err != nil {`
`903`	`903`	`if user_model.IsErrUserNotExist(err) {`