0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-25 00:44:15 -05:00
forgejo/routers
赵智超 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 Hide sync ssh keys button on admin dashboard if ssh disabled or builtin-ssh enabled (#13072) 2020-10-08 12:43:15 -04:00
api/v1 [Enhancement] Allow admin to merge pr with protected file changes (#12078) 2020-10-13 14:50:57 -04:00
dev
events Add EventSource support (#11235) 2020-05-07 22:49:00 +01:00
org Set opengraph attributes on org pages (#12803) 2020-09-11 07:41:43 +01:00
private [Enhancement] Allow admin to merge pr with protected file changes (#12078) 2020-10-13 14:50:57 -04:00
repo [Enhancement] Allow admin to merge pr with protected file changes (#12078) 2020-10-13 14:50:57 -04:00
routes Attachments: Add extension support, allow all types for releases (#12465) 2020-10-05 01:49:33 -04:00
user Update golangci-lint to version 1.31.0 (#13102) 2020-10-11 21:27:20 +01:00
utils Update golangci-lint to version 1.31.0 (#13102) 2020-10-11 21:27:20 +01:00
home.go Simplify CheckUnitUser logic (#12854) 2020-09-15 19:49:34 -04:00
init.go Move all push update operations to a queue (#10133) 2020-09-11 10:14:48 -04:00
install.go Update golangci-lint to version 1.31.0 (#13102) 2020-10-11 21:27:20 +01:00
metrics.go
swagger_json.go Add gitea-vet (#10948) 2020-04-05 07:20:50 +01:00