Skip to content
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

Can not create merge commit when checks succeed #30658

Closed
yp05327 opened this issue Apr 23, 2024 · 1 comment · Fixed by #30780
Closed

Can not create merge commit when checks succeed #30658

yp05327 opened this issue Apr 23, 2024 · 1 comment · Fixed by #30780
Labels
type/bug

Comments

@yp05327
Copy link
Contributor

yp05327 commented Apr 23, 2024 •
edited
Loading

Description

image

reproduce:
user A: site admin
user B: normal user

  • user A: create an individual repo
  • user A: add user B as a contributor with write permission
  • user A: push some code to this repo with an action workflow
  • user A: add a branch rule to main with
    push whitelisted (only user B), required approvals: 1, enable status check
  • user B: create a new branch
  • user B: create PR
  • user B: push a commit to this new branch
  • wait until required jobs finished with success status
    updated: important, if jobs are in pending, you will not get any error
  • user B: click that blue button

Gitea Version

latest

Can you reproduce the bug on the Gitea demo site?

No

Log Gist

No response

Screenshots

No response

Git Version

No response

Operating System

No response

How are you running Gitea?

build

Database

None
@yp05327
Copy link
Contributor Author

yp05327 commented Apr 23, 2024

At first time you click the red button of this PR, it will display a flash error
image

After that you will see the blue button. It will show JSON error.

This was referenced Apr 23, 2024
Closed
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
1 participant
@yp05327