Don't allow merging PR's which are being conflict checked#19357
Merged
Conversation
- 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
This comment was marked as outdated.
This comment was marked as outdated.
GiteaBot
added
the
lgtm/need 2
wxiaoguang
approved these changes
Apr 9, 2022
GiteaBot
added
lgtm/need 1
Gusted
pushed a commit
to Gusted/gitea
that referenced
this pull request
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
delvh
approved these changes
Apr 9, 2022
GiteaBot
added
lgtm/done
Co-authored-by: delvh <dev.lh@web.de>
lunny
reviewed
Apr 9, 2022
lunny
requested changes
Apr 9, 2022
lunny
approved these changes
Apr 10, 2022
lafriks
approved these changes
Apr 10, 2022
lunny
pushed a commit
that referenced
this pull request
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
Member
|
🚀 |
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Apr 20, 2022
* giteaofficial/main: When dumping trim the standard suffices instead of a random suffix (go-gitea#19440) Add uploadpack.allowAnySHA1InWant to allow --filter=blob:none with older git clients (go-gitea#19430) Don't allow merging PR's which are being conflict checked (go-gitea#19357) doc: add brief intro on using traefik as reverse-proxy (go-gitea#19432) Fix panic in team repos API (go-gitea#19431) When updating mirror repo intervals by API reschedule next update too (go-gitea#19429) Fix nil error when some pages are rendered outside request context (go-gitea#19427) Add Helm Chart registry (go-gitea#19406)
|
Hi, we use Gitea 1.16.6 which should have fixed this. However, the bug is still there. UI sometimes hangs even dozens of minutes with "Merge conflict checking is in progress. Try again in few moments." Please could you check again? |
Contributor
Author
|
@pajamrazek The mentioned situation is not related to this PR. |
Member
Please fire another issue if you cannot find one. |
AbdulrhmnGhanem
pushed a commit
to kitspace/gitea
that referenced
this pull request
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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.