You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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>
3 years ago
..
branch Switch archive URL code back to href attributes (#17796) 3 years ago
diff Allow Loading of Diffs that are too large (#17739) 3 years ago
editor Cleanup and use global style on popups (#17674) 3 years ago
graph Fix overflow in commit graph (#17947) 3 years ago
issue Abort merge if head has been updated before pressing merge (#18032) 3 years ago
migrate Use disable_form_autofill on Codebase and Gitbucket (#17936) 3 years ago
projects Cleanup and use global style on popups (#17674) 3 years ago
pulls Improvements to content history (#17746) 3 years ago
release Switch archive URL code back to href attributes (#17796) 3 years ago
settings Add Reindex buttons to repository settings page (#17494) 3 years ago
wiki Add hints for special Wiki pages (#17283) 3 years ago
activity.tmpl Multiple Escaping Improvements (#17551) 3 years ago
blame.tmpl Cleanup and use global style on popups (#17674) 3 years ago
branch_dropdown.tmpl Fixed commit count. (#17698) 3 years ago
clone_buttons.tmpl Add new JS linter rules (#17699) 3 years ago
commit_page.tmpl Add support for ssh commit signing (#17743) 3 years ago
commit_status.tmpl Show dropdown with all statuses for commit (#13977) 4 years ago
commit_statuses.tmpl Show dropdown with all statuses for commit (#13977) 4 years ago
commits.tmpl Add compare tag dropdown to releases page (#15695) 3 years ago
commits_list.tmpl Improve ellipsis buttons (#17773) 3 years ago
commits_list_small.tmpl Improve ellipsis buttons (#17773) 3 years ago
commits_table.tmpl Cleanup and use global style on popups (#17674) 3 years ago
create.tmpl Cleanup and use global style on popups (#17674) 3 years ago
empty.tmpl More pleasantly handle broken or missing git repositories (#17747) 3 years ago
forks.tmpl Add pagination to fork list (#17639) 3 years ago
graph.tmpl Re-separate the color translation strings (#17390) 3 years ago
header.tmpl Improve behavior of "Fork" button (#17288) 3 years ago
home.tmpl Switch archive URL code back to href attributes (#17796) 3 years ago
icon.tmpl Do not display org avatar near icon for internal repos (#13957) 4 years ago
search.tmpl Multiple Escaping Improvements (#17551) 3 years ago
shabox_badge.tmpl Fix avatar template error (#13833) 4 years ago
sub_menu.tmpl Removed SizeFmt. (#17890) 3 years ago
upload.tmpl Add attachments for PR reviews (#16075) 3 years ago
user_cards.tmpl Direct avatar rendering (#13649) 4 years ago
view_file.tmpl Remove whitespace inside rendered code `<td>` (#17859) 3 years ago
view_list.tmpl Render issue references in file table (#17897) 3 years ago
watchers.tmpl Add class to page content to unify top margin (#13766) 4 years ago