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
..
blob.go
branch.go	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
collaborators.go	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
commits.go	Refactor HTTP request context (#17979)	2021-12-15 14:59:57 +08:00
file.go	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
fork.go	Some repository refactors (#17950)	2021-12-12 23:48:20 +08:00
git_hook.go
git_ref.go
hook.go
hook_test.go
issue.go
issue_comment.go
issue_label.go
issue_reaction.go	Add missing X-Total-Count and fix some related bugs (#17968)	2021-12-15 13:39:34 +08:00
issue_stopwatch.go
issue_subscription.go	Add missing X-Total-Count and fix some related bugs (#17968)	2021-12-15 13:39:34 +08:00
issue_tracked_time.go
key.go	Move keys to models/asymkey (#17917)	2021-12-10 16:14:24 +08:00
label.go
language.go	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
main_test.go
migrate.go	Some repository refactors (#17950)	2021-12-12 23:48:20 +08:00
milestone.go
mirror.go
notes.go
pull.go	Abort merge if head has been updated before pressing merge (#18032)	2021-12-20 08:32:54 +08:00
pull_review.go
release.go
release_attachment.go
release_tags.go
repo.go	Some repository refactors (#17950)	2021-12-12 23:48:20 +08:00
repo_test.go	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
star.go	Some repository refactors (#17950)	2021-12-12 23:48:20 +08:00
status.go	Add missing X-Total-Count and fix some related bugs (#17968)	2021-12-15 13:39:34 +08:00
subscriber.go	Some repository refactors (#17950)	2021-12-12 23:48:20 +08:00
tag.go
teams.go	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
topic.go	Some repository refactors (#17950)	2021-12-12 23:48:20 +08:00
transfer.go	Some repository refactors (#17950)	2021-12-12 23:48:20 +08:00
tree.go	Add missing X-Total-Count and fix some related bugs (#17968)	2021-12-15 13:39:34 +08:00
wiki.go	Add missing X-Total-Count and fix some related bugs (#17968)	2021-12-15 13:39:34 +08:00