tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00
Code Releases Activity

Add force_merge to merge request and fix checking mergable (#23010)

Browse Source 
Fix #23000.
This commit is contained in:
Jason Song
2023-02-21 22:42:07 +08:00
committed by GitHub
parent 1fcf96ad01
commit c8c2a31818
6 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/automerge/automerge.go
View File

@@ -230,7 +230,7 @@ func handlePull(pullID int64, sha string) {
return
}
if err := pull_service.CheckPullMergable(ctx, doer, &perm, pr, false, false); err != nil {
if err := pull_service.CheckPullMergable(ctx, doer, &perm, pr, pull_service.MergeCheckTypeGeneral, false); err != nil {
if errors.Is(pull_service.ErrUserNotAllowedToMerge, err) {
log.Info("%-v was scheduled to automerge by an unauthorized user", pr)
return