gitea icon indicating copy to clipboard operation
gitea copied to clipboard

[v1.17.0] Automerge / Admin merge sometimes doesn't work

Open viceice opened this issue 3 years ago • 5 comments

Description

I've two issues^1 which are closely related with latest gitea v1.17.0

  1. I can't see the automerge feature, but normally i can force merge as admin.

  2. 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

image

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

viceice avatar Aug 03 '22 05:08 viceice

After updating the protection rule i could merge ad admin again.

viceice avatar Aug 03 '22 05:08 viceice

I also saw PR's stuck in merge conflict check image

viceice avatar Aug 03 '22 06:08 viceice

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

image

this fixes itself after a few seconds and a page reload

viceice avatar Aug 03 '22 06:08 viceice

Ok, i need to enable at least two merge methods to get the dropdown for automerge

viceice avatar Aug 03 '22 13:08 viceice