Template
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo synced 2024-11-24 18:56:11 +01:00
forgejo/templates/repo
赵智超 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
..
branch Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
diff [Enhancement] Allow admin to merge pr with protected file changes (#12078) 2020-10-13 14:50:57 -04:00
editor Attachments: Add extension support, allow all types for releases (#12465) 2020-10-05 01:49:33 -04:00
issue [Enhancement] Allow admin to merge pr with protected file changes (#12078) 2020-10-13 14:50:57 -04:00
migrate Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
projects Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
pulls Translate two small lables on commit statuse list (#12821) 2020-09-12 15:29:50 +08:00
release Attachments: Add extension support, allow all types for releases (#12465) 2020-10-05 01:49:33 -04:00
settings Set appropriate autocomplete attributes on password fields (#13078) 2020-10-09 10:32:30 +03:00
wiki Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
activity.tmpl Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
blame.tmpl Server-side syntax highlighting for all code (#12047) 2020-07-01 00:34:03 +03:00
branch_dropdown.tmpl Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
commit_page.tmpl Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
commit_status.tmpl UI: Fix overflow issues in repo (#7190) 2019-06-14 09:32:13 +08:00
commits.tmpl Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
commits_list.tmpl Show full GPG commit status on PR commit history (#11702) 2020-06-02 20:22:26 -04:00
commits_list_small.tmpl Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
commits_table.tmpl Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
create.tmpl Add IsTemplate option in create repo ui and api (#12942) 2020-09-25 13:18:37 +08:00
empty.tmpl Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
forks.tmpl #3348 always use relative avatar link in the template 2016-08-05 12:12:54 -07:00
graph.tmpl Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
header.tmpl Use a simple format for the big number on ui (#12822) 2020-09-16 00:07:18 -04:00
header_icon.tmpl Update Octicons to v10 (#12240) 2020-07-17 18:15:12 +03:00
home.tmpl Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
search.tmpl Server-side syntax highlighting for all code (#12047) 2020-07-01 00:34:03 +03:00
shabox_badge.tmpl Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
sub_menu.tmpl Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
upload.tmpl Fix attachments list in edit comment (#13036) 2020-10-11 00:49:59 +01:00
user_cards.tmpl Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
view_file.tmpl Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
view_list.tmpl Make SVG size argument optional (#12814) 2020-09-11 16:19:00 -04:00
watchers.tmpl #1692 APIs: Users Followers 2015-12-21 04:24:11 -08:00