mirror of
1
Fork 0
forgejo/options/locale
赵智超 dfa7291f8f
[Enhancement] Allow admin to merge pr with protected file changes (#12078)
* [Enhancement] Allow admin to merge pr with protected file changes

As tilte, show protected message in diff page and merge box.

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

* remove unused ver

* Update options/locale/locale_en-US.ini

Co-authored-by: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com>

* Add TrN

* Apply suggestions from code review

* fix lint

* Update options/locale/locale_en-US.ini

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

* Apply suggestions from code review

* move pr proteced files check to TestPatch
* Call TestPatch when protected branches settings changed

* Apply review suggestion @CirnoT

* move to service @lunny

* slightly restructure routers/private/hook.go

Adds a lot of comments and simplifies the logic

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

* placate lint

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

* skip duplicate protected files check

* fix check logic

* slight refactor of TestPatch

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

* When checking for protected files changes in TestPatch use the temporary repository

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

* fix introduced issue with hook

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

* Remove the check on PR index being greater than 0 as it unnecessary

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

Co-authored-by: techknowlogick <matti@mdranta.net>
Co-authored-by: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
2020-10-13 14:50:57 -04:00
..
TRANSLATORS European Portuguese translation (#11568) 2020-06-05 09:07:56 +01:00
locale_bg-BG.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_cs-CZ.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_de-DE.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_en-US.ini [Enhancement] Allow admin to merge pr with protected file changes (#12078) 2020-10-13 14:50:57 -04:00
locale_es-ES.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_fa-IR.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_fi-FI.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_fr-FR.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_hu-HU.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_id-ID.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_it-IT.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_ja-JP.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_ko-KR.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_lv-LV.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_ml-IN.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_nl-NL.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_pl-PL.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_pt-BR.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_pt-PT.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_ru-RU.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_sr-SP.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_sv-SE.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_tr-TR.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_uk-UA.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_zh-CN.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_zh-HK.ini [skip ci] Updated translations via Crowdin 2020-10-11 18:52:13 +00:00
locale_zh-TW.ini [skip ci] Updated translations via Crowdin 2020-10-13 16:25:13 +00:00