From bdd2c9d2eff76fed2cc200377723f519e8af64d0 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brecht@blender.org>
Date: Thu, 9 Feb 2023 18:08:42 +0100
Subject: [PATCH] Fix update by rebase being wrongly disabled by protected base
branch (#22825)
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.
---
services/pull/update.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/services/pull/update.go b/services/pull/update.go
index ede89bcdff..b9525cf0c9 100644
--- 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
}