1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-24 13:09:23 -05:00
forgejo/templates/repo/issue
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
..
labels Multiple Escaping Improvements (#17551) 2021-11-16 18:18:25 +00:00
view_content Abort merge if head has been updated before pressing merge (#18032) 2021-12-20 08:32:54 +08:00
branch_selector_field.tmpl Add option to define refs in issue templates (#17842) 2021-12-17 21:29:09 +00:00
choose.tmpl Add class to page content to unify top margin (#13766) 2020-11-30 23:00:14 -05:00
comment_tab.tmpl Add attachments for PR reviews (#16075) 2021-06-14 21:12:33 -04:00
label_precolors.tmpl Indent all templates with tabs 2015-12-08 00:57:46 +01:00
labels.tmpl Add class to page content to unify top margin (#13766) 2020-11-30 23:00:14 -05:00
list.tmpl Multiple Escaping Improvements (#17551) 2021-11-16 18:18:25 +00:00
milestone_issues.tmpl Fix layout of milestone view (#15927) 2021-05-20 17:53:55 -04:00
milestone_new.tmpl Add class to page content to unify top margin (#13766) 2020-11-30 23:00:14 -05:00
milestones.tmpl Use a generic markup class to display externally rendered files and diffs (#15735) 2021-05-07 10:43:41 +02:00
navbar.tmpl Search bar for issues/pulls (#530) 2017-01-25 10:43:02 +08:00
new.tmpl Add class to page content to unify top margin (#13766) 2020-11-30 23:00:14 -05:00
new_form.tmpl Redirect on project after issue created (#17211) 2021-10-05 21:21:52 +02:00
openclose.tmpl Markdown and Repo header tweaks (#13744) 2020-11-29 17:52:11 +02:00
search.tmpl Disable search box autofocus on issue/pr pages (#12229) 2020-07-26 22:43:14 -04:00
view.tmpl Multiple Escaping Improvements (#17551) 2021-11-16 18:18:25 +00:00
view_content.tmpl Display issue/comment role even if repo archived (#17907) 2021-12-05 17:04:02 +02:00
view_title.tmpl Cleanup and use global style on popups (#17674) 2021-11-18 11:26:50 +08:00