Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
viceice opened this issue Aug 3, 2022 · 5 comments · Fixed by #30780
Closed

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

viceice opened this issue Aug 3, 2022 · 5 comments · Fixed by #30780
Labels
type/bug

Comments

@viceice
Copy link
Contributor

viceice commented Aug 3, 2022

Description

I've two issues1 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

Footnotes

  1. https://discourse.gitea.io/t/gitea-automerge-when-succeed-v1-17/5620 ↩
@viceice
Copy link
Contributor Author

viceice commented Aug 3, 2022

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

@viceice
Copy link
Contributor Author

viceice commented Aug 3, 2022

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

@viceice
Copy link
Contributor Author

viceice commented Aug 3, 2022 •
edited
Loading

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
Copy link
Contributor Author

viceice commented Aug 3, 2022

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

@lunny
Copy link
Member

lunny commented May 2, 2024

I think this is the same as #24445 and should be fixed by #30780

@lunny lunny mentioned this issue May 7, 2024
Merged
@lunny lunny closed this as completed in c6cf96d May 21, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this issue May 21, 2024
@lunny @6543
@wxiaoguang @GiteaBot
Fix automerge will not work because of some events haven't been trigg…
d3d5ace 
…ered (go-gitea#30780)

Replace go-gitea#25741
Close go-gitea#24445
Close go-gitea#30658
Close go-gitea#20646
~Depends on go-gitea#30805~

Since go-gitea#25741 has been rewritten totally, to make the contribution
easier, I will continue the work in this PR. Thanks @6543

---------

Co-authored-by: 6543 <[email protected]>
Co-authored-by: wxiaoguang <[email protected]>
@GiteaBot GiteaBot mentioned this issue May 21, 2024
Merged
lunny added a commit that referenced this issue May 22, 2024
@GiteaBot @lunny
@6543 @wxiaoguang
Fix automerge will not work because of some events haven't been trigg…
2648962 
…ered (#30780) (#31039)

Backport #30780 by @lunny

Replace #25741
Close #24445
Close #30658
Close #20646
~Depends on #30805~

Since #25741 has been rewritten totally, to make the contribution
easier, I will continue the work in this PR. Thanks @6543

Co-authored-by: Lunny Xiao <[email protected]>
Co-authored-by: 6543 <[email protected]>
Co-authored-by: wxiaoguang <[email protected]>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 19, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
type/bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Fix automerge will not work because of some events haven't been triggered lunny/gitea
2 participants
@lunny @viceice