赵智超 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
..
action.go	Move all push update operations to a queue (#10133)	2020-09-11 10:14:48 -04:00
action_test.go	Move all push update operations to a queue (#10133)	2020-09-11 10:14:48 -04:00
blob.go	Add Close() method to gogitRepository (#8901)	2019-11-13 07:01:19 +00:00
blob_test.go	prefer NoError/Error over Nil/NotNil (#12271)	2020-07-19 12:53:40 +03:00
commit.go
commit_status.go	Add Close() method to gogitRepository (#8901)	2019-11-13 07:01:19 +00:00
content.go	Fix GetContents(): Dont't ignore Executables (#11192)	2020-04-24 19:20:22 +03:00
content_test.go	prefer NoError/Error over Nil/NotNil (#12271)	2020-07-19 12:53:40 +03:00
delete.go	Add configurable Trust Models (#11712)	2020-09-20 00:44:55 +08:00
diff.go	Move git diff codes from models to services/gitdiff (#7889)	2019-09-05 22:20:09 -04:00
diff_test.go	prefer NoError/Error over Nil/NotNil (#12271)	2020-07-19 12:53:40 +03:00
file.go	File Edit: Author/Committer interchanged [BugFix] (#9297)	2019-12-09 21:11:24 +08:00
file_test.go	prefer NoError/Error over Nil/NotNil (#12271)	2020-07-19 12:53:40 +03:00
repofiles.go
repofiles_test.go
temp_repo.go	Add configurable Trust Models (#11712)	2020-09-20 00:44:55 +08:00
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)	2019-12-22 00:16:21 +00:00
tree_test.go	prefer NoError/Error over Nil/NotNil (#12271)	2020-07-19 12:53:40 +03:00
update.go	[Enhancement] Allow admin to merge pr with protected file changes (#12078)	2020-10-13 14:50:57 -04:00
upload.go	LFS support to be stored on minio (#12518)	2020-09-08 23:45:10 +08:00
verification.go	Sign merges, CRUD, Wiki and Repository initialisation with gpg key (#7631)	2019-10-16 14:42:42 +01:00