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
..
add_reaction.tmpl	Align dropdown right (#14406)	2021-01-20 02:08:21 +01:00
attachments.tmpl	Enforce tab indentation in templates (#15289)	2021-04-10 23:46:37 -04:00
comments_delete_time.tmpl	Cleanup and use global style on popups (#17674)	2021-11-18 11:26:50 +08:00
comments.tmpl	Display issue/comment role even if repo archived (#17907)	2021-12-05 17:04:02 +02:00
context_menu.tmpl	Multiple Escaping Improvements (#17551)	2021-11-16 18:18:25 +00:00
pull.tmpl	Abort merge if head has been updated before pressing merge (#18032)	2021-12-20 08:32:54 +08:00
reactions.tmpl	Support unicode emojis and remove emojify.js (#11032)	2020-04-28 15:05:39 -03:00
reference_issue_dialog.tmpl	Comment - Reference in new issue (#14366)	2021-01-21 14:51:17 +01:00
sidebar.tmpl	Cleanup and use global style on popups (#17674)	2021-11-18 11:26:50 +08:00