赵智超 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
..
labels	Make SVG size argument optional (#12814)	2020-09-11 16:19:00 -04:00
view_content	[Enhancement] Allow admin to merge pr with protected file changes (#12078)	2020-10-13 14:50:57 -04:00
branch_selector_field.tmpl	Make SVG size argument optional (#12814)	2020-09-11 16:19:00 -04:00
choose.tmpl	Add ui style for "Open a blank issue" button (#12824)	2020-09-16 10:07:09 +08:00
comment_tab.tmpl	Attachments: Add extension support, allow all types for releases (#12465)	2020-10-05 01:49:33 -04:00
label_precolors.tmpl
labels.tmpl
list.tmpl	Make SVG size argument optional (#12814)	2020-09-11 16:19:00 -04:00
milestone_issues.tmpl	Make SVG size argument optional (#12814)	2020-09-11 16:19:00 -04:00
milestone_new.tmpl
milestones.tmpl	Make SVG size argument optional (#12814)	2020-09-11 16:19:00 -04:00
navbar.tmpl
new_form.tmpl	Make SVG size argument optional (#12814)	2020-09-11 16:19:00 -04:00
new.tmpl
search.tmpl
view_content.tmpl	Fix attachments list in edit comment (#13036)	2020-10-11 00:49:59 +01:00
view_title.tmpl	Make SVG size argument optional (#12814)	2020-09-11 16:19:00 -04:00
view.tmpl