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		4 years ago
..
check.go	Make manual merge autodetection optional and add manual merge as merge method (#12543)	4 years ago
check_test.go	migrate from com.* to alternatives (#14103)	4 years ago
commit_status.go	[Refactor] CombinedStatus and CommitStatus related functions & structs (#14026)	4 years ago
lfs.go	Add basic repository lfs management (#7199)	5 years ago
main_test.go	Move some pull request functions from models to services (#9266)	5 years ago
merge.go	Always set the merge base used to merge the commit (#15352) (#15385)	4 years ago
patch.go	Make manual merge autodetection optional and add manual merge as merge method (#12543)	4 years ago
pull.go	Migrate to use jsoniter instead of encoding/json (#14841)	4 years ago
pull_test.go	Move PushToBaseRepo from models to services/pull (#9352)	5 years ago
review.go	Fix a couple of CommentAsPatch issues. (#14804)	4 years ago
temp_repo.go	Handle more pathological branch and tag names (#11843)	5 years ago
update.go	IsUserAllowedToUpdate ignore igonre if user is nil (#14885)	4 years ago