This repository has been archived on 2024-01-04. You can view files and clone it, but cannot push or open issues or pull requests.

zeripath e4e411821d Abort merge if head has been updated before pressing merge (#18032) ... * Abort merge if head has been updated before pressing merge It is possible that a PR head may be pushed to between the merge page being shown and the merge button being pressed. Pass the current expected head in as a parameter and cancel the merge if it has changed. Fix #18028 Signed-off-by: Andrew Thornton <art27@cantab.net> * adjust swagger Signed-off-by: Andrew Thornton <art27@cantab.net> * fix test Signed-off-by: Andrew Thornton <art27@cantab.net> * placate lint Signed-off-by: Andrew Thornton <art27@cantab.net>		2021-12-20 08:32:54 +08:00
..
check.go
check_test.go
commit_status.go
lfs.go
main_test.go
merge.go	Abort merge if head has been updated before pressing merge (#18032)	2021-12-20 08:32:54 +08:00
patch.go	Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004)	2021-12-19 05:19:25 +01:00
patch_unmerged.go	Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004)	2021-12-19 05:19:25 +01:00
pull.go
pull_test.go
review.go
temp_repo.go
update.go	Abort merge if head has been updated before pressing merge (#18032)	2021-12-20 08:32:54 +08:00