gitea

History

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>

2020-02-10 13:09:08 +00:00

comments

Refactor pull request review (#8954 )

2019-11-14 10:57:36 +08:00

externalaccount

Allow externalID to be UUID (#8551 )

2019-10-17 10:06:28 +08:00

gitdiff

Check if diff actually contains sections when rendering (#9926 ) (#9933 )

2020-01-22 08:02:57 +00:00

issue

Refactor comment (#9330 )