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.
gitea/modules/repofiles
赵智超 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
..
action.go Move all push update operations to a queue (#10133) 4 years ago
action_test.go Move all push update operations to a queue (#10133) 4 years ago
blob.go Add Close() method to gogitRepository (#8901) 5 years ago
blob_test.go prefer NoError/Error over Nil/NotNil (#12271) 5 years ago
commit.go Number of commits ahead/behind in branch overview (#6695) 6 years ago
commit_status.go Add Close() method to gogitRepository (#8901) 5 years ago
content.go Fix GetContents(): Dont't ignore Executables (#11192) 5 years ago
content_test.go prefer NoError/Error over Nil/NotNil (#12271) 5 years ago
delete.go Add configurable Trust Models (#11712) 4 years ago
diff.go Move git diff codes from models to services/gitdiff (#7889) 6 years ago
diff_test.go prefer NoError/Error over Nil/NotNil (#12271) 5 years ago
file.go File Edit: Author/Committer interchanged [BugFix] (#9297) 5 years ago
file_test.go prefer NoError/Error over Nil/NotNil (#12271) 5 years ago
repofiles.go Fixes 4762 - Content API for Creating, Updating, Deleting Files (#6314) 6 years ago
repofiles_test.go Fixes 4762 - Content API for Creating, Updating, Deleting Files (#6314) 6 years ago
temp_repo.go Add configurable Trust Models (#11712) 4 years ago
tree.go fixed bug in GitTreeBySHA where pulling items from a page other than page 1 would fail because the wrong var was used to set the entries to return (#9459) 5 years ago
tree_test.go prefer NoError/Error over Nil/NotNil (#12271) 5 years ago
update.go [Enhancement] Allow admin to merge pr with protected file changes (#12078) 4 years ago
upload.go LFS support to be stored on minio (#12518) 4 years ago
verification.go Sign merges, CRUD, Wiki and Repository initialisation with gpg key (#7631) 5 years ago