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.
forgejo/options/locale
a1012112796 a5279b74b6
Make manual merge autodetection optional and add manual merge as merge method (#12543)
* Make auto check manual merge as a chooseable mod and add manual merge way on ui

as title, Before this pr, we use same way with GH to check manually merge.
It good, but in some special cases, misjudgments can occur. and it's hard
to fix this bug. So I add option to allow repo manager block "auto check manual merge"
function, Then it will have same style like gitlab(allow empty pr). and to compensate for
not being able to detect THE PR merge automatically, I added a manual approach.

Signed-off-by: a1012112796 <1012112796@qq.com>

* make swager

* api support

* ping ci

* fix TestPullCreate_EmptyChangesWithCommits

* Apply suggestions from code review

Co-authored-by: zeripath <art27@cantab.net>

* Apply review suggestions and add test

* Apply suggestions from code review

Co-authored-by: zeripath <art27@cantab.net>

* fix build

* test error message

* make fmt

* Fix indentation issues identified by @silverwind

Co-authored-by: silverwind <me@silverwind.io>

* Fix tests and make manually merged disabled error on API the same

Signed-off-by: Andrew Thornton <art27@cantab.net>

* a small nit

* fix wrong commit id error

* fix bug

* simple test

* fix test

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
3 years ago
..
TRANSLATORS European Portuguese translation (#11568) 4 years ago
locale_bg-BG.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_cs-CZ.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_de-DE.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_en-US.ini Make manual merge autodetection optional and add manual merge as merge method (#12543) 3 years ago
locale_es-ES.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_fa-IR.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_fi-FI.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_fr-FR.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_hu-HU.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_id-ID.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_it-IT.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_ja-JP.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_ko-KR.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_lv-LV.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_ml-IN.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_nl-NL.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_pl-PL.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_pt-BR.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_pt-PT.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_ru-RU.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_sr-SP.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_sv-SE.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_tr-TR.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_uk-UA.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_zh-CN.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_zh-HK.ini [skip ci] Updated translations via Crowdin 3 years ago
locale_zh-TW.ini [skip ci] Updated translations via Crowdin 3 years ago