[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 <[email protected]>

* remove unused ver

* Update options/locale/locale_en-US.ini

Co-authored-by: Cirno the Strongest <[email protected]>

* Add TrN

* Apply suggestions from code review

* fix lint

* Update options/locale/locale_en-US.ini

Co-authored-by: zeripath <[email protected]>

* 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 <[email protected]>

* placate lint

Signed-off-by: Andrew Thornton <[email protected]>

* skip duplicate protected files check

* fix check logic

* slight refactor of TestPatch

Signed-off-by: Andrew Thornton <[email protected]>

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

Signed-off-by: Andrew Thornton <[email protected]>

* fix introduced issue with hook

Signed-off-by: Andrew Thornton <[email protected]>

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

Signed-off-by: Andrew Thornton <[email protected]>

Co-authored-by: techknowlogick <[email protected]>
Co-authored-by: Cirno the Strongest <[email protected]>
Co-authored-by: zeripath <[email protected]>
Co-authored-by: techknowlogick <[email protected]>
This commit is contained in:
赵智超
2020-10-13 14:50:57 -04:00
committed by GitHub
parent da32d0e72a
commit dfa7291f8f
19 changed files with 464 additions and 185 deletions
+1
View File
@@ -351,6 +351,7 @@ type DiffFile struct {
IsSubmodule bool
Sections []*DiffSection
IsIncomplete bool
IsProtected bool
}
// GetType returns type of diff file.