Skip to content

Don't allow merging PR's which are being conflict checked #19357

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 8 commits into from
Apr 20, 2022
Merged

Don't allow merging PR's which are being conflict checked #19357

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
24e1ec3
Don't allow merging PR's which are being conflict checked
Apr 9, 2022
dfa830f
Fix grammar
Apr 9, 2022
b6e6412
Improve error message
Apr 9, 2022
dfa73be
Merge branch 'main' into prevent-conflict-checking-pr
lafriks Apr 10, 2022
53257f6
Merge branch 'main' into prevent-conflict-checking-pr
lunny Apr 12, 2022
ca74593
Merge branch 'main' into prevent-conflict-checking-pr
lunny Apr 15, 2022
7455a6a
Merge branch 'main' into prevent-conflict-checking-pr
6543 Apr 20, 2022
fd877ab
Merge branch 'main' into prevent-conflict-checking-pr
6543 Apr 20, 2022
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
5 changes: 5 additions & 0 deletions services/pull/check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ var (
ErrUserNotAllowedToMerge = errors.New("user not allowed to merge")
ErrHasMerged = errors.New("has already been merged")
ErrIsWorkInProgress = errors.New("work in progress PRs cannot be merged")
ErrIsChecking = errors.New("cannot merge while conflict checking is in progress")
ErrNotMergableState = errors.New("not in mergeable state")
ErrDependenciesLeft = errors.New("is blocked by an open dependency")
)
Expand Down Expand Up @@ -88,6 +89,10 @@ func CheckPullMergable(ctx context.Context, doer *user_model.User, perm *models.
return ErrNotMergableState
}

if pr.IsChecking() {
return ErrIsChecking
}

if err := CheckPRReadyToMerge(ctx, pr, false); err != nil {
if models.IsErrDisallowedToMerge(err) {
if force {
Expand Down