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.

zeripath 875c5e1305 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 * enforce locking - fix-test * enforce locking - fix-testx2 * enforce locking - fix-testx3 * 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 * fixup * move check pr after merge * Remove unnecessary prepareTestEnv - onGiteaRun does this for us * Add information about when merging occuring * fix fmt * More logging * Attempt to fix mysql * Try MySQL fix again * try again * Try again?! * Try again?! * Sigh * remove the count - perhaps that will help * next remove the update id * next remove the update id - make it updated_unix instead * On failure to merge ensure that the pr is rechecked for conflict errors * On failure to merge ensure that the pr is rechecked for conflict errors * Update models/pull.go * Update models/pull.go Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com> * Apply suggestions from code review Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com> Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>		5 years ago
..
comments	Refactor pull request review (#8954)	5 years ago
externalaccount	Allow externalID to be UUID (#8551)	5 years ago
gitdiff	Some refactor on git diff and ignore getting commit information failed on migrating pull request review comments (#9996)	5 years ago
issue	Refactor comment (#9330)	5 years ago
mailer	Switch to use -f instead of -F for sendmail (#9961)	5 years ago
mirror	Move newbranch to standalone package (#9627)	5 years ago
pull	Only check for conflicts/merging if the PR has not been merged in the interim (#10132)	5 years ago
release	Move PushUpdateAddDeleteTags to repository module from models (#10106)	5 years ago
repository	API endpoint for repo transfer (#9947)	5 years ago
wiki	Refactor repository check and sync functions (#9854)	5 years ago