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

Don't allow merging PR's which are being conflict checked #19357

Merged
merged 8 commits into from
Apr 20, 2022
Merged

Don't allow merging PR's which are being conflict checked #19357

merged 8 commits into from
Apr 20, 2022

Conversation

Gusted
Copy link
Contributor

@Gusted Gusted commented Apr 9, 2022 •
edited
Loading

Don't allow merging PR's which are being conflict checked
24e1ec3 
- 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 Gusted added this to the 1.17.0 milestone Apr 9, 2022
@Gusted Gusted added the type/bug label Apr 9, 2022
@codecov-commenter

This comment was marked as outdated.

Sign in to view
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 9, 2022
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 9, 2022
Gusted pushed a commit to Gusted/gitea that referenced this pull request Apr 9, 2022
Don't allow merging PR's which are being conflict checked (go-gitea#…
a8be922 
…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
@Gusted Gusted mentioned this pull request Apr 9, 2022
Merged
@Gusted Gusted added the backport/done All backports for this PR have been created label Apr 9, 2022
delvh
delvh approved these changes Apr 9, 2022
View reviewed changes
services/pull/check.go Outdated Show resolved Hide resolved
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 9, 2022
@delvh
Improve error message
b6e6412 
Co-authored-by: delvh <dev.lh@web.de>
lunny
lunny requested changes Apr 9, 2022
View reviewed changes
Copy link
Member

@lunny lunny left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's not enough, checking queue check is also a necessary.

lunny pushed a commit that referenced this pull request Apr 12, 2022
Don't allow merging PR's which are being conflict checked (#19357) (#…
081449d 
…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
Copy link
Member

6543 commented Apr 20, 2022

🚀

@6543 6543 merged commit 5e68fe7 into go-gitea:main Apr 20, 2022
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 20, 2022
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
a6b983f 
* 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)
@pajamrazek
Copy link

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?

@Gusted
Copy link
Contributor Author

Gusted commented Apr 28, 2022

@pajamrazek The mentioned situation is not related to this PR.

@Gusted Gusted deleted the prevent-conflict-checking-pr branch April 28, 2022 15:36
@lunny
Copy link
Member

lunny commented Apr 28, 2022

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?

Please fire another issue if you cannot find one.

AbdulrhmnGhanem pushed a commit to kitspace/gitea that referenced this pull request Aug 24, 2022
@delvh @AbdulrhmnGhanem
Don't allow merging PR's which are being conflict checked (go-gitea#1…
7cec136 
…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>
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@delvh delvh delvh approved these changes

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@lafriks lafriks lafriks approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.17.0
Development

Successfully merging this pull request may close these issues.

Merged pull not marked as merged when conflict checking still in progress
9 participants
@Gusted @codecov-commenter @6543 @pajamrazek @lunny @lafriks @wxiaoguang @delvh @GiteaBot