赵智超 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
..
activity.go
attachment.go	Attachments: Add extension support, allow all types for releases (#12465)	2020-10-05 01:49:33 -04:00
blame.go
branch.go
commit.go
compare.go	Attachments: Add extension support, allow all types for releases (#12465)	2020-10-05 01:49:33 -04:00
download.go	Update golangci-lint to version 1.31.0 (#13102)	2020-10-11 21:27:20 +01:00
editor.go	Update golangci-lint to version 1.31.0 (#13102)	2020-10-11 21:27:20 +01:00
editor_test.go
http.go	Update golangci-lint to version 1.31.0 (#13102)	2020-10-11 21:27:20 +01:00
issue.go	[Enhancement] Allow admin to merge pr with protected file changes (#12078)	2020-10-13 14:50:57 -04:00
issue_dependency.go
issue_label.go
issue_label_test.go
issue_lock.go
issue_stopwatch.go
issue_timetrack.go
issue_watch.go
lfs.go	Add default storage configurations (#12813)	2020-09-29 12:05:13 +03:00
main_test.go
middlewares.go
migrate.go	Adopt repositories (#12920)	2020-09-25 07:09:23 +03:00
milestone.go
projects.go
pull.go	[Enhancement] Allow admin to merge pr with protected file changes (#12078)	2020-10-13 14:50:57 -04:00
pull_review.go
release.go	Attachments: Add extension support, allow all types for releases (#12465)	2020-10-05 01:49:33 -04:00
release_test.go
repo.go	Add IsTemplate option in create repo ui and api (#12942)	2020-09-25 13:18:37 +08:00
search.go
setting.go	Improve error feedback for duplicate deploy keys (#13112)	2020-10-12 14:44:56 +01:00
setting_protected_branch.go	[Enhancement] Allow admin to merge pr with protected file changes (#12078)	2020-10-13 14:50:57 -04:00
settings_test.go	Disable DSA ssh keys by default (#13056)	2020-10-09 09:52:57 +03:00
topic.go
view.go	Update golangci-lint to version 1.31.0 (#13102)	2020-10-11 21:27:20 +01:00
webhook.go
wiki.go
wiki_test.go