You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

6543 c95d9603ea Only check for conflicts/merging if the PR has not been merged in the interim (#10132) (#10206) ... * Only check for conflicts/merging if the PR has not been merged in the interim (#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> * re order Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>		4 years ago
..
check.go	Only check for conflicts/merging if the PR has not been merged in the interim (#10132) (#10206)	4 years ago
check_test.go	Only check for conflicts/merging if the PR has not been merged in the interim (#10132) (#10206)	4 years ago
commit_status.go	Fix wrong hint when status checking is running on pull request view (#9886) (#9928)	4 years ago
lfs.go	Add basic repository lfs management (#7199)	5 years ago
main_test.go	Move some pull request functions from models to services (#9266)	4 years ago
merge.go	Only check for conflicts/merging if the PR has not been merged in the interim (#10132) (#10206)	4 years ago
patch.go	Remove stray printf (#9631)	4 years ago
pull.go	PRs: Move to use a temporary repo for pushing new prs (#10009) (#10042)	4 years ago
pull_test.go	Move PushToBaseRepo from models to services/pull (#9352)	4 years ago
review.go	remove unused method and rename createcommentWithNoAction (#9367)	4 years ago
temp_repo.go	Remove SavePatch and generate patches on the fly (#9302)	4 years ago