You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
forgejo/services
zeripath 84f5a0bc62
Always set the merge base used to merge the commit (#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
3 years ago
..
archiver migrate from com.* to alternatives (#14103) 4 years ago
comments Enhance Ghost comment mitigation Settings (#14392) 3 years ago
externalaccount Allow externalID to be UUID (#8551) 5 years ago
forms Add LFS Migration and Mirror (#14726) 3 years ago
gitdiff Add LFS Migration and Mirror (#14726) 3 years ago
issue label and milestone webhooks on issue/pull creation (#14363) 3 years ago
lfs Add LFS Migration and Mirror (#14726) 3 years ago
mailer [refactor] mailer service (#15072) 3 years ago
mirror Add LFS Migration and Mirror (#14726) 3 years ago
pull Always set the merge base used to merge the commit (#15352) 3 years ago
release Implement delete release attachments and update release attachments' name (#14130) 3 years ago
repository Repository transfer has to be confirmed, if user can not create repo for new owner (#14792) 3 years ago
webhook Migrate to use jsoniter instead of encoding/json (#14841) 3 years ago
wiki migrate from com.* to alternatives (#14103) 4 years ago