Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 9, 2023
Merged

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

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3b3e67f
Fix update by rebase being wrongly disabled by protected base branch
brechtvl Feb 8, 2023
8cdc85c
Update services/pull/update.go
wolfogre Feb 9, 2023
b5b64a4
Merge branch 'main' into fix-update-by-rebase-protected
wolfogre Feb 9, 2023
56d51b6
Merge branch 'main' into fix-update-by-rebase-protected
lunny Feb 9, 2023
0217564
Merge branch 'main' into fix-update-by-rebase-protected
lunny Feb 9, 2023
bf9a43c
Merge branch 'main' into fix-update-by-rebase-protected
techknowlogick Feb 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion services/pull/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down