gitea
gitea copied to clipboard
[v1.17.0] Automerge / Admin merge sometimes doesn't work
Description
I've two issues^1 which are closely related with latest gitea v1.17.0
-
I can't see the automerge feature, but normally i can force merge as admin.
-
Today i couldn't merge PR's because they where blocked because they are outdated
Gitea Version
1.17.0
Can you reproduce the bug on the Gitea demo site?
No
Log Gist
No response
Screenshots


Git Version
offical docker image
Operating System
offical docker image
How are you running Gitea?
2 node HA from official gitea chart with redis / nfs
Database
PostgreSQL
After updating the protection rule i could merge ad admin again.
I also saw PR's stuck in merge conflict check

sometimes i also see broken fork information after using the merge update button

this fixes itself after a few seconds and a page reload
Ok, i need to enable at least two merge methods to get the dropdown for automerge