Fix update by rebase being wrongly disabled by protected base branch (#22825)

brechtvl · web-flow · commit bdd2c9d2eff7 · 2023-02-09T12:08:42.000-05:00
The branch this is force pushing to is the head branch in the head repo,
so it should be checking if that is protected, not the base.
diff --git a/services/pull/update.go b/services/pull/update.go
@@ -106,7 +106,7 @@ func IsUserAllowedToUpdate(ctx context.Context, pull *issues_model.PullRequest,
 		BaseBranch: pull.HeadBranch,
 	}
 
-	pb, err := git_model.GetFirstMatchProtectedBranchRule(ctx, pull.BaseRepoID, pull.BaseBranch)
+	pb, err := git_model.GetFirstMatchProtectedBranchRule(ctx, pr.BaseRepoID, pr.BaseBranch)
 	if err != nil {
 		return false, false, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ func IsUserAllowedToUpdate(ctx context.Context, pull *issues_model.PullRequest,`
`106`	`106`	`BaseBranch: pull.HeadBranch,`
`107`	`107`	`}`
`108`	`108`
`109`		`- pb, err := git_model.GetFirstMatchProtectedBranchRule(ctx, pull.BaseRepoID, pull.BaseBranch)`
	`109`	`+ pb, err := git_model.GetFirstMatchProtectedBranchRule(ctx, pr.BaseRepoID, pr.BaseBranch)`
`110`	`110`	`if err != nil {`
`111`	`111`	`return false, false, err`
`112`	`112`	`}`