gitea-fork-majority-judgment

History

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
..
comments	Refactor pull request review (#8954 )	4 years ago
externalaccount	Allow externalID to be UUID (#8551 )	5 years ago
gitdiff	Check if diff actually contains sections when rendering (#9926 ) (#9933 )	4 years ago
issue	Refactor comment (#9330 )	4 years ago
mailer	Switch to use -f instead of -F for sendmail (#9961 ) (#9970 )	4 years ago
mirror	Use limited commits (#9572 )	4 years ago
pull	Only check for conflicts/merging if the PR has not been merged in the interim (#10132 ) (#10206 )	4 years ago
release	Graceful: Cancel Process on monitor pages & HammerTime (#9213 )	4 years ago
repository	Fix pull view when head repository or head branch missed and close related pull requests when delete head repository or head branch (#9927 ) (#9974 )	4 years ago
wiki	Move wiki related funtions from models to services/wiki (#9355 )	4 years ago