1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-21 08:31:27 -05:00
forgejo/templates
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
..
admin Add Option to synchronize Admin & Restricted states from OIDC/OAuth2 along with Setting Scopes (#16766) 2021-12-14 16:37:11 +08:00
base Clean legacy SimpleMDE code (#17926) 2021-12-10 10:51:27 +08:00
custom Add footer extra links template (#9576) 2020-01-03 20:41:56 +02:00
explore Add archived label for code search results in archived repo's (#17817) 2021-11-26 16:49:31 +08:00
mail Multiple Escaping Improvements (#17551) 2021-11-16 18:18:25 +00:00
org org settings -> webhook/labels/deletion should also active the menu (#17809) 2021-11-25 23:15:58 +08:00
repo Abort merge if head has been updated before pressing merge (#18032) 2021-12-20 08:32:54 +08:00
shared Change <a> elements to underline on hover (#17898) 2021-12-18 05:29:00 +00:00
status Refactor HTTP request context (#17979) 2021-12-15 14:59:57 +08:00
swagger Abort merge if head has been updated before pressing merge (#18032) 2021-12-20 08:32:54 +08:00
user Add support for ssh commit signing (#17743) 2021-12-19 00:37:18 -05:00
home.tmpl Rename StaticUrlPrefix to AssetUrlPrefix (#15779) 2021-05-08 16:27:25 +02:00
install.tmpl Refactor install page (db type) (#17919) 2021-12-07 13:44:08 +08:00
post-install.tmpl Rename StaticUrlPrefix to AssetUrlPrefix (#15779) 2021-05-08 16:27:25 +02:00