2 Commits (4f646889021f04b09c7e5b1c4fa2d324c35f1720)

Author	SHA1	Message	Date
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>	5 years ago
Lunny Xiao	82e0383d21	Move some pull request functions from models to services (#9266) ... * Move some pull request functions from models to services * Fix test	5 years ago