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
..
admin	Ensure complexity, minlength and ispwned are checked on password setting (#18005)	2021-12-17 10:03:39 +08:00
misc	Move keys to models/asymkey (#17917)	2021-12-10 16:14:24 +08:00
notify	Fix 500 when a comment was deleted which has a notification (#17550)	2021-11-10 13:48:45 +08:00
org	Add missing X-Total-Count and fix some related bugs (#17968)	2021-12-15 13:39:34 +08:00
repo	Abort merge if head has been updated before pressing merge (#18032)	2021-12-20 08:32:54 +08:00
settings	Make mirror feature more configurable (#16957)	2021-09-07 17:49:36 +02:00
swagger	Add API to get/edit wiki (#17278)	2021-10-25 11:43:40 +08:00
user	Refactor HTTP request context (#17979)	2021-12-15 14:59:57 +08:00
utils	Use a standalone struct name for Organization (#17632)	2021-11-19 19:41:40 +08:00
api.go	Some repository refactors (#17950)	2021-12-12 23:48:20 +08:00