TODO

Author: wxiaoguang

services/pull/merge.go

@@ -547,11 +547,15 @@ var escapedSymbols = regexp.MustCompile(`([*[?! \\])`)
 
 // IsUserAllowedToMerge check if user is allowed to merge PR with given permissions and branch protections
 func IsUserAllowedToMerge(ctx context.Context, pr *issues_model.PullRequest, p access_model.Permission, user *user_model.User) (bool, error) {
+	return isUserAllowedToMergeRepoBranch(ctx, pr.BaseRepoID, pr.BaseBranch, p, user)
+}
+
+func isUserAllowedToMergeRepoBranch(ctx context.Context, repoID int64, branch string, p access_model.Permission, user *user_model.User) (bool, error) {
 	if user == nil {
 		return false, nil
 	}
 
-	pb, err := git_model.GetFirstMatchProtectedBranchRule(ctx, pr.BaseRepoID, pr.BaseBranch)
+	pb, err := git_model.GetFirstMatchProtectedBranchRule(ctx, repoID, branch)
 	if err != nil {
 		return false, err
 	}

services/pull/update.go

@@ -121,6 +121,7 @@ func IsUserAllowedToUpdate(ctx context.Context, pull *issues_model.PullRequest,
 		return false, false, err
 	}
 
+	// TODO: why use base repo's unit?
 	prUnit, err := pull.BaseRepo.GetUnit(ctx, unit.TypePullRequests)
 	if err != nil {
 		if repo_model.IsErrUnitTypeNotExist(err) {
@@ -155,6 +156,37 @@ func IsUserAllowedToUpdate(ctx context.Context, pull *issues_model.PullRequest,
 	// if merge is not allowed, rebase is also not allowed
 	rebaseAllowed = rebaseAllowed && mergeAllowed
 
+	/*
+		// TODO: revert to old logic with isUserAllowedToMergeRepoBranch
+		// If branch protected, disable rebase unless user is whitelisted to force push (which extends regular push)
+		if pb != nil {
+			pb.Repo = pull.BaseRepo
+			if !pb.CanUserForcePush(ctx, user) {
+				rebaseAllowed = false
+			}
+
+		}
+
+		baseRepoPerm, err := access_model.GetUserRepoPermission(ctx, pull.BaseRepo, user)
+		if err != nil {
+			return false, false, err
+		}
+
+		mergeAllowed, err = IsUserAllowedToMerge(ctx, pr, headRepoPerm, user)
+		if err != nil {
+			return false, false, err
+		}
+
+		if pull.AllowMaintainerEdit {
+			mergeAllowedMaintainer, err := IsUserAllowedToMerge(ctx, pr, baseRepoPerm, user)
+			if err != nil {
+				return false, false, err
+			}
+
+			mergeAllowed = mergeAllowed || mergeAllowedMaintainer
+		}
+	*/
+
 	return mergeAllowed, rebaseAllowed, nil
 }