1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-26 09:09:36 -05:00
forgejo/templates
赵智超 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
..
admin Add ssh certificate support (#12281) 2020-10-10 20:38:09 -04:00
base hCaptcha Support (#12594) 2020-10-02 23:37:53 -04:00
custom Add footer extra links template (#9576) 2020-01-03 20:41:56 +02:00
explore Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
mail Add email notify for new release (#12463) 2020-08-23 16:03:18 +01:00
org Set appropriate autocomplete attributes on password fields (#13078) 2020-10-09 10:32:30 +03:00
pwa Move serviceworker to workbox and fix SSE interference (#11538) 2020-05-21 21:45:34 -04:00
repo [Enhancement] Allow admin to merge pr with protected file changes (#12078) 2020-10-13 14:50:57 -04:00
status Make error pages translatable (#11163) 2020-04-27 18:03:15 -05:00
swagger fix: case typo (#13049) 2020-10-06 12:16:16 -04:00
user Add ssh certificate support (#12281) 2020-10-10 20:38:09 -04:00
home.tmpl Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
install.tmpl Set appropriate autocomplete attributes on password fields (#13078) 2020-10-09 10:32:30 +03:00