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.
赵智超 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>
4 years ago
..
check.go [Enhancement] Allow admin to merge pr with protected file changes (#12078) 4 years ago
check_test.go Only check for conflicts/merging if the PR has not been merged in the interim (#10132) 4 years ago
commit_status.go Fix bug on pull view when required status check no ci result (#10648) 4 years ago
lfs.go Add basic repository lfs management (#7199) 5 years ago
main_test.go Move some pull request functions from models to services (#9266) 5 years ago
merge.go [Enhancement] Allow admin to merge pr with protected file changes (#12078) 4 years ago
patch.go [Enhancement] Allow admin to merge pr with protected file changes (#12078) 4 years ago
pull.go [Enhancement] Allow admin to merge pr with protected file changes (#12078) 4 years ago
pull_test.go Move PushToBaseRepo from models to services/pull (#9352) 5 years ago
review.go Add team support for review request (#12039) 4 years ago
temp_repo.go Handle more pathological branch and tag names (#11843) 4 years ago
update.go Check Push permissions on IsUserAllowedToUpdate (#11448) 4 years ago