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
..
branch
diff
editor
graph	Fix overflow in commit graph (#17947)	2021-12-11 16:12:18 +02:00
issue	Abort merge if head has been updated before pressing merge (#18032)	2021-12-20 08:32:54 +08:00
migrate	Use disable_form_autofill on Codebase and Gitbucket (#17936)	2021-12-08 22:33:14 +00:00
projects
pulls
release
settings	Add Reindex buttons to repository settings page (#17494)	2021-12-16 23:55:12 +08:00
wiki	Add hints for special Wiki pages (#17283)	2021-12-03 15:28:54 +08:00
activity.tmpl
blame.tmpl
branch_dropdown.tmpl
clone_buttons.tmpl
commit_page.tmpl	Add support for ssh commit signing (#17743)	2021-12-19 00:37:18 -05:00
commit_status.tmpl
commit_statuses.tmpl
commits_list_small.tmpl
commits_list.tmpl
commits_table.tmpl
commits.tmpl
create.tmpl
empty.tmpl
forks.tmpl
graph.tmpl
header.tmpl	Improve behavior of "Fork" button (#17288)	2021-12-13 09:59:09 +08:00
home.tmpl
icon.tmpl
search.tmpl
shabox_badge.tmpl
sub_menu.tmpl	Removed SizeFmt. (#17890)	2021-12-03 11:33:34 +08:00
upload.tmpl
user_cards.tmpl
view_file.tmpl
view_list.tmpl	Render issue references in file table (#17897)	2021-12-04 00:15:53 +08:00
watchers.tmpl