diff options
| author | Jason Song <i@wolfogre.com> | 2023-02-21 22:42:07 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-21 08:42:07 -0600 |
| commit | c8c2a31818527f7377ddb9fb111a55d0c058ebe7 (patch) | |
| tree | 5ebb1653b112dbf66e00d9ec34755382cfd5c6cf /services/automerge | |
| parent | 1fcf96ad0166420cbdb013365ecae42e3537b42a (diff) | |
| download | gitea-c8c2a31818527f7377ddb9fb111a55d0c058ebe7.tar.gz gitea-c8c2a31818527f7377ddb9fb111a55d0c058ebe7.zip | |
Add force_merge to merge request and fix checking mergable (#23010)
Fix #23000.
Diffstat (limited to 'services/automerge')
| -rw-r--r-- | services/automerge/automerge.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/automerge/automerge.go b/services/automerge/automerge.go index 74cfb8da8f..9946047640 100644 --- a/services/automerge/automerge.go +++ b/services/automerge/automerge.go @@ -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 |