mirror of
1
Fork 0
forgejo/templates/repo/diff
赵智超 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
..
blob_excerpt.tmpl Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
box.tmpl [Enhancement] Allow admin to merge pr with protected file changes (#12078) 2020-10-13 14:50:57 -04:00
comment_form.tmpl Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
comment_form_datahandler.tmpl Pull request review/approval and comment on code (#3748) 2018-08-06 06:43:21 +02:00
comments.tmpl Fix to allow comment poster to edit or delete his own comments (#11671) 2020-06-05 13:10:10 +03:00
compare.tmpl Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
image_diff.tmpl Bugfix for image compare and minor improvements to image compare (#8289) 2019-10-04 15:58:54 -04:00
new_comment.tmpl Pull request review/approval and comment on code (#3748) 2018-08-06 06:43:21 +02:00
new_review.tmpl Fix missing styling for dropdown icon on review button (#11998) 2020-06-22 03:02:22 +03:00
options_dropdown.tmpl Support view individual commit for wiki pages (#11415) 2020-05-16 19:38:40 +03:00
section_unified.tmpl Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
whitespace_dropdown.tmpl Add whitespace handling to PR-comparsion (#4683) 2018-08-14 13:49:33 -04:00