赵智超 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
..
fixtures
migrations	[Enhancement] Allow admin to merge pr with protected file changes (#12078)	2020-10-13 14:50:57 -04:00
access.go
access_test.go
action.go
action_list.go
action_test.go
admin.go
admin_test.go
attachment.go
attachment_test.go
avatar.go
branches.go	[Enhancement] Allow admin to merge pr with protected file changes (#12078)	2020-10-13 14:50:57 -04:00
branches_test.go
commit_status.go
commit_status_test.go
consistency.go
context.go
convert.go
error.go
error_oauth2.go
external_login_user.go
fixture_generation.go
fixture_test.go
gpg_key.go
gpg_key_test.go
helper.go
helper_directory.go
helper_environment.go
issue.go
issue_assignees.go
issue_assignees_test.go
issue_comment.go
issue_comment_list.go
issue_comment_test.go
issue_dependency.go
issue_dependency_test.go
issue_label.go	Save TimeStamps for Star, Label, Follow, Watch and Collaboration to Database (#13124)	2020-10-12 20:01:57 -04:00
issue_label_test.go	Save TimeStamps for Star, Label, Follow, Watch and Collaboration to Database (#13124)	2020-10-12 20:01:57 -04:00
issue_list.go
issue_list_test.go
issue_lock.go
issue_milestone.go
issue_milestone_test.go
issue_reaction.go
issue_reaction_test.go
issue_stopwatch.go
issue_stopwatch_test.go
issue_test.go
issue_tracked_time.go
issue_tracked_time_test.go
issue_user.go
issue_user_test.go
issue_watch.go
issue_watch_test.go
issue_xref.go
issue_xref_test.go
lfs.go
lfs_lock.go
list_options.go
log.go
login_source.go
main_test.go
migrate.go
models.go
models_test.go
notification.go
notification_test.go
oauth2.go
oauth2_application.go
oauth2_application_test.go
org.go
org_team.go
org_team_test.go
org_test.go
project.go
project_board.go
project_issue.go
project_test.go
pull.go	[Enhancement] Allow admin to merge pr with protected file changes (#12078)	2020-10-13 14:50:57 -04:00
pull_list.go
pull_sign.go
pull_test.go
release.go
repo.go
repo_activity.go
repo_branch.go
repo_collaboration.go	Save TimeStamps for Star, Label, Follow, Watch and Collaboration to Database (#13124)	2020-10-12 20:01:57 -04:00
repo_collaboration_test.go
repo_generate.go
repo_generate_test.go
repo_indexer.go
repo_issue.go
repo_language_stats.go
repo_list.go
repo_list_test.go
repo_mirror.go
repo_permission.go
repo_permission_test.go
repo_redirect.go
repo_redirect_test.go
repo_sign.go
repo_test.go
repo_unit.go
repo_watch.go	Save TimeStamps for Star, Label, Follow, Watch and Collaboration to Database (#13124)	2020-10-12 20:01:57 -04:00
repo_watch_test.go
review.go
review_test.go
ssh_key.go
ssh_key_test.go
star.go	Save TimeStamps for Star, Label, Follow, Watch and Collaboration to Database (#13124)	2020-10-12 20:01:57 -04:00
star_test.go
task.go
test_fixtures.go
token.go
token_test.go
topic.go
topic_test.go
twofactor.go
u2f.go
u2f_test.go
unit.go
unit_tests.go	Provide self-registering storage system (#12978)	2020-10-12 23:58:34 -04:00
update.go
upload.go
user.go
user_follow.go	Save TimeStamps for Star, Label, Follow, Watch and Collaboration to Database (#13124)	2020-10-12 20:01:57 -04:00
user_follow_test.go
user_heatmap.go
user_heatmap_test.go
user_mail.go
user_mail_test.go
user_openid.go
user_openid_test.go
user_test.go
userlist.go
userlist_test.go
webhook.go
webhook_test.go
wiki.go
wiki_test.go