Scheduling an auto-merge no longer works in 1.18.4

[parnic-sks]

Description

The "auto-merge when checks succeed" feature was working in 1.18.3, but in 1.18.4, users receive

This pull request is not ready to be merged, check review status and status checks.

Same error message is being seen in #23000 but this is a non-admin scenario, so I thought it probably deserved its own issue.

This is not reproducing on try.gitea.io, but on try, I don't see the auto-merge feature at all, so maybe I'm doing something wrong.

Gitea Version

1.18.4

Can you reproduce the bug on the Gitea demo site?

No

Log Gist

No response

Screenshots

Git Version

2.39.1

Operating System

Ubuntu 20.04.3, aarch64/arm64

How are you running Gitea?

Self-built from 1.18.4 tag with an additional fix to LFS downloads.

Database

PostgreSQL

[wxiaoguang]

The biggest (and somewhat related) PR between 1.18.3 and 1.18.4 is #22812 @zeripath do you have a time to take a look?

[wxiaoguang]

OK, I think I understand the problem now.

It's the same problem as #23000 , the problem is that there were bugs on bug, which made the old code happened to work.

When the "force checking" bug was fixed by #22812, other bugs came.

To fix other bugs, I think the code should be like:

skipProtectionCheck := force || auto

CheckPullMergable( ..., skipProtectionCheck bool)

A fix is on the way.

[zeripath]

Ah bugs that are hidden due to other bugs - the gift that keeps on giving.

I think this clearly indicates we need some tests for the automerge capability - however, that may mean that it needs some restructuring in order to make it testable.

[lunny]

I think we need to redesign the automerge, we need a queue like what Github did.

[lunny]

Isn't this fixed by #23010 ?

[zeripath]

yup Fixed by #23010