Merged pull not marked as merged when conflict checking still in progress #19352
Comments
Gusted
pushed a commit
to Gusted/gitea
that referenced
this issue
Apr 9, 2022
- When a PR is still being conflict checked, don't allow the PR to be merged(the merge button could already be visible before e.g. a new commit was pushed to the PR). - Relevant(should prevent such issue from happening) go-gitea#19352
Gusted
pushed a commit
to Gusted/gitea
that referenced
this issue
Apr 9, 2022
…19357) - Backport of go-gitea#19357 - When a PR is still being conflict checked, don't allow the PR to be merged(the merge button could already be visible before e.g. a new commit was pushed to the PR). - Resolves go-gitea#19352
lunny
pushed a commit
that referenced
this issue
Apr 12, 2022
…19358) * Don't allow merging PR's which are being conflict checked (#19357) - Backport of #19357 - When a PR is still being conflict checked, don't allow the PR to be merged(the merge button could already be visible before e.g. a new commit was pushed to the PR). - Resolves #19352 * Update error message
6543
pushed a commit
that referenced
this issue
Apr 20, 2022
* Don't allow merging PR's which are being conflict checked - When a PR is still being conflict checked, don't allow the PR to be merged(the merge button could already be visible before e.g. a new commit was pushed to the PR). - Relevant(should prevent such issue from happening) #19352 Co-authored-by: delvh <dev.lh@web.de>
AbdulrhmnGhanem
pushed a commit
to kitspace/gitea
that referenced
this issue
Aug 24, 2022
…9357) * Don't allow merging PR's which are being conflict checked - When a PR is still being conflict checked, don't allow the PR to be merged(the merge button could already be visible before e.g. a new commit was pushed to the PR). - Relevant(should prevent such issue from happening) go-gitea#19352 Co-authored-by: delvh <dev.lh@web.de>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Description
Merging a pull request on the web UI doesn't mark it as merged when the conflict checking is still in progres.
I encountered this on Codeberg, here: https://codeberg.org/Codeberg/Documentation/pulls/211 (the PR was marked as manually merged, but the actual merge happend using the web UI). I couldn't reproduce on try.gitea.io, but I suppose it's a timing issue with the merge conflict checker, I didn't manage to get into a state where I could see the "Conflict checking still in progress window" (but I saw this on Codeberg after B was merged).
CC @Gusted
Gitea Version
1.16.5
Can you reproduce the bug on the Gitea demo site?
No
Log Gist
No response
Screenshots
Git Version
No response
Operating System
Debian GNU/Linux
How are you running Gitea?
Codeberg deployment (manually compiled custom fork), run without container on a Debian Linux machine.
Database
MySQL
The text was updated successfully, but these errors were encountered: