core
/
gitea
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
gitea/templates/repo
History
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 Switch archive URL code back to href attributes (#17796) 2021-11-29 21:50:43 +08:00
diff Allow Loading of Diffs that are too large (#17739) 2021-11-22 00:51:08 +08:00
editor Cleanup and use global style on popups (#17674) 2021-11-18 11:26:50 +08:00
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 Cleanup and use global style on popups (#17674) 2021-11-18 11:26:50 +08:00
pulls Improvements to content history (#17746) 2021-11-22 20:20:16 +08:00
release Switch archive URL code back to href attributes (#17796) 2021-11-29 21:50:43 +08:00
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 Multiple Escaping Improvements (#17551) 2021-11-16 18:18:25 +00:00
blame.tmpl Cleanup and use global style on popups (#17674) 2021-11-18 11:26:50 +08:00
branch_dropdown.tmpl Fixed commit count. (#17698) 2021-11-17 23:50:17 +00:00
clone_buttons.tmpl Add new JS linter rules (#17699) 2021-11-22 16:19:01 +08:00
commit_page.tmpl Add support for ssh commit signing (#17743) 2021-12-19 00:37:18 -05:00
commit_status.tmpl Show dropdown with all statuses for commit (#13977) 2020-12-20 11:13:12 +08:00
commit_statuses.tmpl Show dropdown with all statuses for commit (#13977) 2020-12-20 11:13:12 +08:00
commits.tmpl Add compare tag dropdown to releases page (#15695) 2021-05-03 13:27:48 -04:00
commits_list.tmpl Improve ellipsis buttons (#17773) 2021-11-22 21:44:38 -05:00
commits_list_small.tmpl Improve ellipsis buttons (#17773) 2021-11-22 21:44:38 -05:00
commits_table.tmpl Cleanup and use global style on popups (#17674) 2021-11-18 11:26:50 +08:00
create.tmpl Cleanup and use global style on popups (#17674) 2021-11-18 11:26:50 +08:00
empty.tmpl More pleasantly handle broken or missing git repositories (#17747) 2021-11-22 22:32:16 +00:00
forks.tmpl Add pagination to fork list (#17639) 2021-11-18 22:45:56 +08:00
graph.tmpl Re-separate the color translation strings (#17390) 2021-10-21 23:51:03 +02:00
header.tmpl Improve behavior of "Fork" button (#17288) 2021-12-13 09:59:09 +08:00
home.tmpl Switch archive URL code back to href attributes (#17796) 2021-11-29 21:50:43 +08:00
icon.tmpl Do not display org avatar near icon for internal repos (#13957) 2020-12-13 16:51:15 -05:00
search.tmpl Multiple Escaping Improvements (#17551) 2021-11-16 18:18:25 +00:00
shabox_badge.tmpl Fix avatar template error (#13833) 2020-12-03 23:12:59 +00:00
sub_menu.tmpl Removed SizeFmt. (#17890) 2021-12-03 11:33:34 +08:00
upload.tmpl Add attachments for PR reviews (#16075) 2021-06-14 21:12:33 -04:00
user_cards.tmpl Direct avatar rendering (#13649) 2020-12-03 19:46:11 +01:00
view_file.tmpl Remove whitespace inside rendered code `<td>` (#17859) 2021-11-30 00:01:56 +02:00
view_list.tmpl Render issue references in file table (#17897) 2021-12-04 00:15:53 +08:00
watchers.tmpl Add class to page content to unify top margin (#13766) 2020-11-30 23:00:14 -05:00