Mirrors/gitea
0
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-02 17:20:53 +02:00
Code Issues Activity

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

Browse Source 
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.
This commit is contained in:
Brecht Van Lommel authored and GitHub committed 2023-02-09 12:08:42 -05:00
1 parent 137fcc989b
commit bdd2c9d2ef
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
services/pull/update.go
+1 -1
View File
@@ -106,7 +106,7 @@ func IsUserAllowedToUpdate(ctx context.Context, pull *issues_model.PullRequest,
BaseBranch: pull.HeadBranch, 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 { if err != nil {
return false, false, err return false, false, err
} }