1
1
mirror of https://github.com/go-gitea/gitea synced 2024-12-25 10:04:27 +00:00
gitea/services
zeripath 1fe5fe419e
Always set the merge base used to merge the commit (#15352) (#15385)
Backport #15352

The issue is that the TestPatch will reset the PR MergeBase - and it is possible for TestPatch to update the MergeBase whilst a merge is ongoing. The ensuing merge will then complete but it doesn't re-set the MergeBase it used to merge the PR.

Fixes the intermittent error in git test.

Signed-off-by: Andrew Thornton art27@cantab.net
2021-04-10 14:08:30 +02:00
..
archiver migrate from com.* to alternatives (#14103) 2020-12-25 11:59:32 +02:00
comments Enhance Ghost comment mitigation Settings (#14392) 2021-01-21 21:56:19 -05:00
externalaccount Allow externalID to be UUID (#8551) 2019-10-17 10:06:28 +08:00
gitdiff Prevent NPE in CommentMustAsDiff if no hunk header (#15199) (#15200) 2021-04-01 15:14:56 -04:00
issue label and milestone webhooks on issue/pull creation (#14363) 2021-01-17 16:15:57 +02:00
mailer Repository transfer has to be confirmed, if user can not create repo for new owner (#14792) 2021-03-01 01:47:30 +01:00
mirror Create tag on ui (#13467) 2021-02-28 19:57:45 +00:00
pull Always set the merge base used to merge the commit (#15352) (#15385) 2021-04-10 14:08:30 +02:00
release Create tag on ui (#13467) 2021-02-28 19:57:45 +00:00
repository Repository transfer has to be confirmed, if user can not create repo for new owner (#14792) 2021-03-01 01:47:30 +01:00
webhook Migrate to use jsoniter instead of encoding/json (#14841) 2021-03-01 22:08:10 +01:00
wiki migrate from com.* to alternatives (#14103) 2020-12-25 11:59:32 +02:00