Branch protection: Possibility to not use whitelist but allow anyone with write access

models/branches.go

@@ -26,11 +26,11 @@ const (
 
 // ProtectedBranch struct
 type ProtectedBranch struct {
-	ID                        int64              `xorm:"pk autoincr"`
-	RepoID                    int64              `xorm:"UNIQUE(s)"`
-	BranchName                string             `xorm:"UNIQUE(s)"`
-	CanPush                   bool               `xorm:"NOT NULL DEFAULT false"`
-	EnableWhitelist           bool               `xorm:"NOT NULL DEFAULT false"`
+	ID                        int64  `xorm:"pk autoincr"`
+	RepoID                    int64  `xorm:"UNIQUE(s)"`
+	BranchName                string `xorm:"UNIQUE(s)"`
+	CanPush                   bool   `xorm:"NOT NULL DEFAULT false"`
+	EnableWhitelist           bool
 	WhitelistUserIDs          []int64            `xorm:"JSON TEXT"`
 	WhitelistTeamIDs          []int64            `xorm:"JSON TEXT"`
 	EnableMergeWhitelist      bool               `xorm:"NOT NULL DEFAULT false"`

models/migrations/v110.go

@@ -5,6 +5,8 @@
 package migrations
 
 import (
+	"errors"
+
 	"code.gitea.io/gitea/models"
 
 	"xorm.io/xorm"
@@ -14,7 +16,6 @@ func addBranchProtectionCanPushAndEnableWhitelist(x *xorm.Engine) error {
 
 	type ProtectedBranch struct {
 		CanPush                  bool  `xorm:"NOT NULL DEFAULT false"`
-		EnableWhitelist          bool  `xorm:"NOT NULL DEFAULT false"`
 		EnableApprovalsWhitelist bool  `xorm:"NOT NULL DEFAULT false"`
 		RequiredApprovals        int64 `xorm:"NOT NULL DEFAULT 0"`
 	}
@@ -43,30 +44,37 @@ func addBranchProtectionCanPushAndEnableWhitelist(x *xorm.Engine) error {
 	}
 
 	var pageSize int64 = 20
-	totallPRs, err := x.Count(new(models.PullRequest))
+	qresult, err := sess.QueryInterface("SELECT max(id) as max_id FROM pull_request")
 	if err != nil {
 		return err
 	}
-	var totalPages int64
-	totalPages = totallPRs / pageSize
+	var totalPRs int64
+	totalPRs, ok := qresult[0]["max_id"].(int64)
+	if !ok {
+		// This shouldn't happen
+		return errors.New("Failed to get max id for Pull Requests")
+	}
+	totalPages := totalPRs / pageSize
 
 	// Find latest review of each user in each pull request, and set official field if appropriate
 	reviews := []*models.Review{}
 	var page int64
 	for page = 0; page <= totalPages; page++ {
-		if err := sess.Sql("SELECT * FROM review WHERE id IN (SELECT max(id) as id FROM review WHERE issue_id > ? AND issue_id <= ? AND type in (?, ?) GROUP BY issue_id, reviewer_id)",
+		if err := sess.SQL("SELECT * FROM review WHERE id IN (SELECT max(id) as id FROM review WHERE issue_id > ? AND issue_id <= ? AND type in (?, ?) GROUP BY issue_id, reviewer_id)",
 			page*pageSize, (page+1)*pageSize, models.ReviewTypeApprove, models.ReviewTypeReject).
 			Find(&reviews); err != nil {
 			return err
 		}
 
 		for _, review := range reviews {
 			if err := review.LoadAttributes(); err != nil {
-				return err
+				// Error might occur if user or issue doesn't exist, ignore it.
+				continue
 			}
 			official, err := models.IsOfficialReviewer(review.Issue, review.Reviewer)
 			if err != nil {
-				return err
+				// Branch might not be proteced or other error, ignore it.
+				continue
 			}
 			review.Official = official