0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-26 10:24:38 +01:00
gitea/options/locale
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
..
locale_bg-BG.ini
locale_cs-CZ.ini
locale_de-DE.ini [skip ci] Updated translations via Crowdin 2021-12-16 00:28:34 +00:00
locale_el-GR.ini [skip ci] Updated translations via Crowdin 2021-12-16 00:28:34 +00:00
locale_en-US.ini Abort merge if head has been updated before pressing merge (#18032) 2021-12-20 08:32:54 +08:00
locale_es-ES.ini [skip ci] Updated translations via Crowdin 2021-12-16 00:28:34 +00:00
locale_fa-IR.ini
locale_fi-FI.ini
locale_fr-FR.ini
locale_hu-HU.ini
locale_id-ID.ini
locale_it-IT.ini
locale_ja-JP.ini [skip ci] Updated translations via Crowdin 2021-12-16 00:28:34 +00:00
locale_ko-KR.ini
locale_lv-LV.ini
locale_ml-IN.ini
locale_nl-NL.ini
locale_pl-PL.ini
locale_pt-BR.ini
locale_pt-PT.ini [skip ci] Updated translations via Crowdin 2021-12-18 00:28:35 +00:00
locale_ru-RU.ini [skip ci] Updated translations via Crowdin 2021-12-16 00:28:34 +00:00
locale_si-LK.ini
locale_sr-SP.ini
locale_sv-SE.ini
locale_tr-TR.ini [skip ci] Updated translations via Crowdin 2021-12-16 00:28:34 +00:00
locale_uk-UA.ini
locale_zh-CN.ini [skip ci] Updated translations via Crowdin 2021-12-18 00:28:35 +00:00
locale_zh-HK.ini
locale_zh-TW.ini [skip ci] Updated translations via Crowdin 2021-12-16 00:28:34 +00:00
TRANSLATORS