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

Only check for conflicts/merging if the PR has not been merged in the interim (#10132) #10206

Merged
merged 2 commits into from Feb 10, 2020
Merged

Only check for conflicts/merging if the PR has not been merged in the interim (#10132) #10206

merged 2 commits into from Feb 10, 2020

Conversation

6543
Copy link
Member

@6543 6543 commented Feb 10, 2020 •
edited

Backports #10132

zeripath and others added 2 commits February 10, 2020 12:49
@zeripath @lafriks
@guillep2k @6543
Only check for conflicts/merging if the PR has not been merged in the…
d907f51 
… interim (go-gitea#10132)

* Only check for merging if the PR has not been merged in the interim

* fixup! Only check for merging if the PR has not been merged in the interim

* Try to fix test failure

* Use PR2 not PR1 in tests as PR1 merges automatically

* return already merged error

* enforce locking

* move pullrequest checking to after merge

This might improve the chance that the race does not affect us but does not prevent it.

* Remove minor race with getting merge commit id

move check pr after merge

* Remove unnecessary prepareTestEnv - onGiteaRun does this for us

* Add information about when merging occuring

* More logging

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
@6543
re order
68af585
@lunny lunny added this to the 1.11.0 milestone Feb 10, 2020
@6543
Copy link
Member Author

6543 commented Feb 10, 2020

@lunny can you move milestone to 1.11.1 pleace

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 10, 2020
@lafriks lafriks modified the milestones: 1.11.0, 1.11.1 Feb 10, 2020
@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 Feb 10, 2020
@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 Feb 10, 2020
@zeripath zeripath merged commit c95d960 into go-gitea:release/v1.11 Feb 10, 2020
@6543 6543 deleted the backport_10132 branch February 10, 2020 13:10
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lafriks lafriks lafriks approved these changes

@zeripath zeripath zeripath approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.11.1
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@6543 @lafriks @zeripath @lunny @GiteaBot