Template
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo synced 2024-11-25 11:16:11 +01:00
forgejo/routers/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
..
activity.go Add top author stats to activity page (#9615) 2020-01-20 12:07:30 +02:00
attachment.go Attachments: Add extension support, allow all types for releases (#12465) 2020-10-05 01:49:33 -04:00
blame.go Ensure BlameReaders close at end of request (#12102) 2020-07-01 14:01:17 +01:00
branch.go Move all push update operations to a queue (#10133) 2020-09-11 10:14:48 -04:00
commit.go Render the git graph on the server (#12333) 2020-08-06 09:04:08 +01:00
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 Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
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 Fix wrong permissions check when issues/prs shared operations (#9885) 2020-01-20 13:00:32 +01:00
issue_label.go Move jquery-minicolors to npm/webpack (#12305) 2020-07-29 14:44:23 -04:00
issue_label_test.go fix go vet error (#3740) 2018-03-30 07:21:27 +08:00
issue_lock.go Implement "conversation lock" for issue comments (#5073) 2019-02-18 22:55:04 +02:00
issue_stopwatch.go Automatically clear stopwatch on merging a PR (#4327) 2019-02-05 13:38:11 +02:00
issue_timetrack.go [API] Extend times API (#9200) 2019-12-27 20:30:58 +00:00
issue_watch.go Fix PR/issue redirects when having external tracker (#9339) 2019-12-14 01:53:32 +01:00
lfs.go Add default storage configurations (#12813) 2020-09-29 12:05:13 +03:00
main_test.go Unit tests for wiki routers (#3022) 2017-11-30 17:52:15 +02:00
middlewares.go Add gitea-vet (#10948) 2020-04-05 07:20:50 +01:00
migrate.go Adopt repositories (#12920) 2020-09-25 07:09:23 +03:00
milestone.go Issue templates directory (#11450) 2020-09-11 10:48:39 -04:00
projects.go Hide 'New Project board' button for users that are not signed in (#12547) 2020-08-22 02:58:59 -04:00
pull.go [Enhancement] Allow admin to merge pr with protected file changes (#12078) 2020-10-13 14:50:57 -04:00
pull_review.go Add a way to mark Conversation (code comment) resolved (#11037) 2020-04-18 10:50:25 -03:00
release.go Attachments: Add extension support, allow all types for releases (#12465) 2020-10-05 01:49:33 -04:00
release_test.go Add Close() method to gogitRepository (#8901) 2019-11-13 07:01:19 +00:00
repo.go Add IsTemplate option in create repo ui and api (#12942) 2020-09-25 13:18:37 +08:00
search.go Add detected file language to code search (#10256) 2020-02-20 16:53:55 -03:00
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 Add API endpoint for accessing repo topics (#7963) 2019-09-03 23:46:24 +08:00
view.go Update golangci-lint to version 1.31.0 (#13102) 2020-10-11 21:27:20 +01:00
webhook.go Don't use legacy method to send Matrix Webhook (#12348) 2020-07-30 18:04:19 -04:00
wiki.go Allow different HardBreaks settings for documents and comments (#11515) 2020-05-24 09:14:26 +01:00
wiki_test.go Fix wiki raw view on sub path (#10002) 2020-01-28 09:44:08 +00:00