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
..
check.go	Make manual merge autodetection optional and add manual merge as merge method (#12543)	2021-03-03 22:41:23 -05:00
check_test.go	migrate from com.* to alternatives (#14103)	2020-12-25 11:59:32 +02:00
commit_status.go	[Refactor] CombinedStatus and CommitStatus related functions & structs (#14026)	2020-12-18 11:33:32 +08:00
lfs.go	Add basic repository lfs management (#7199)	2019-10-28 18:31:55 +00:00
main_test.go	Move some pull request functions from models to services (#9266)	2019-12-06 21:44:10 -05:00
merge.go	Always set the merge base used to merge the commit (#15352) (#15385)	2021-04-10 14:08:30 +02:00
patch.go	Make manual merge autodetection optional and add manual merge as merge method (#12543)	2021-03-03 22:41:23 -05:00
pull.go	Migrate to use jsoniter instead of encoding/json (#14841)	2021-03-01 22:08:10 +01:00
pull_test.go	Move PushToBaseRepo from models to services/pull (#9352)	2019-12-15 04:28:51 +01:00
review.go	Fix a couple of CommentAsPatch issues. (#14804)	2021-02-27 19:46:14 +01:00
temp_repo.go	Handle more pathological branch and tag names (#11843)	2020-06-11 19:49:47 -04:00
update.go	IsUserAllowedToUpdate ignore igonre if user is nil (#14885)	2021-03-04 19:27:54 +01:00