Merge remote-tracking branch 'upstream/main' into limit-repo-size

routers/private/actions.go

@@ -77,9 +77,10 @@ func parseScope(ctx *context.PrivateContext, scope string) (ownerID, repoID int6
 	if err != nil {
 		return ownerID, repoID, err
 	}
+	ownerID = u.ID
 
 	if !found {
-		return u.ID, repoID, nil
+		return ownerID, repoID, nil
 	}
 
 	r, err := repo_model.GetRepositoryByName(u.ID, repoName)

routers/private/hook_pre_receive.go

@@ -61,7 +61,7 @@ func (ctx *preReceiveContext) CanWriteCode() bool {
 		if !ctx.loadPusherAndPermission() {
 			return false
 		}
-		ctx.canWriteCode = issues_model.CanMaintainerWriteToBranch(ctx.userPerm, ctx.branchName, ctx.user) || ctx.deployKeyAccessMode >= perm_model.AccessModeWrite
+		ctx.canWriteCode = issues_model.CanMaintainerWriteToBranch(ctx, ctx.userPerm, ctx.branchName, ctx.user) || ctx.deployKeyAccessMode >= perm_model.AccessModeWrite
 		ctx.checkedCanWriteCode = true
 	}
 	return ctx.canWriteCode