forked from gitea/gitea
1
0
Fork 0
gitea/modules
赵智超 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
..
analyze Exclude generated files from language statistics (#11653) 2020-05-29 09:20:01 +03:00
auth hCaptcha Support (#12594) 2020-10-02 23:37:53 -04:00
avatar Fix Avatar Resize (resize algo NearestNeighbor -> Bilinear) (#12745) 2020-09-06 20:53:33 +01:00
base Use a simple format for the big number on ui (#12822) 2020-09-16 00:07:18 -04:00
cache Allow common redis and leveldb connections (#12385) 2020-09-28 00:09:46 +03:00
charset Ensure that the detected charset order is set in chardet test (#12574) 2020-08-23 14:15:29 +01:00
context [API] If User is Admin, show 500 error message on PROD mode too (#13115) 2020-10-12 20:41:49 -04:00
convert [#13004] Add Timestamp to Tag list API (#13026) 2020-10-05 12:07:54 +08:00
cron Add ssh certificate support (#12281) 2020-10-10 20:38:09 -04:00
emoji Fix emoji detection in certain cases (#12320) 2020-07-25 16:40:04 +03:00
eventsource Move EventSource to SharedWorker (#12095) 2020-07-03 10:55:36 +01:00
generate Add gitea-vet (#10948) 2020-04-05 07:20:50 +01:00
git Update golangci-lint to version 1.31.0 (#13102) 2020-10-11 21:27:20 +01:00
gitgraph Render the git graph on the server (#12333) 2020-08-06 09:04:08 +01:00
graceful Set TLS minimum version to 1.2 (#12689) 2020-09-02 23:37:49 +01:00
hcaptcha hCaptcha Support (#12594) 2020-10-02 23:37:53 -04:00
highlight Escape failed highlighted code (#12685) 2020-09-02 16:19:42 -04:00
httplib Add golangci (#6418) 2019-06-12 15:41:28 -04:00
indexer fix: use Base36 for all code indexers (#12830) 2020-09-14 13:40:07 +03:00
lfs LFS support to be stored on minio (#12518) 2020-09-08 23:45:10 +08:00
log Update golangci-lint to version 1.31.0 (#13102) 2020-10-11 21:27:20 +01:00
markup Update golangci-lint to version 1.31.0 (#13102) 2020-10-11 21:27:20 +01:00
metrics Prometheus endpoint (#5256) 2018-11-04 22:20:00 -05:00
migrations 4 line diff (#13103) 2020-10-12 09:15:15 +08:00
nosql Allow common redis and leveldb connections (#12385) 2020-09-28 00:09:46 +03:00
notification Fix repository create/delete event webhooks (#13008) 2020-10-02 10:37:46 +01:00
options Rename scripts to build and add revive command as a new build tool command (#10942) 2020-04-03 22:29:12 +03:00
password Check passwords against HaveIBeenPwned (#12716) 2020-09-08 17:06:39 -05:00
pprof Add golangci (#6418) 2019-06-12 15:41:28 -04:00
private Rename models.ProtectedBranchRepoID to models.EnvRepoID and ensure EnvPusherEmail is set (#12646) 2020-08-30 08:24:39 +01:00
process Only write to global gitconfig if necessary (#11876) 2020-06-13 17:47:31 -04:00
public fix go1.15 lint error in modules/public/public.go (#12707) 2020-09-04 16:15:54 +03:00
queue Fix the issue reported on #12385 (#12969) 2020-09-28 19:00:54 -04:00
recaptcha hCaptcha Support (#12594) 2020-10-02 23:37:53 -04:00
references Add spent time to referenced issue in commit message (#12220) 2020-09-04 11:37:37 -04:00
repofiles [Enhancement] Allow admin to merge pr with protected file changes (#12078) 2020-10-13 14:50:57 -04:00
repository Update golangci-lint to version 1.31.0 (#13102) 2020-10-11 21:27:20 +01:00
secret Attachments: Add extension support, allow all types for releases (#12465) 2020-10-05 01:49:33 -04:00
session Allow common redis and leveldb connections (#12385) 2020-09-28 00:09:46 +03:00
setting Provide self-registering storage system (#12978) 2020-10-12 23:58:34 -04:00
ssh Add ssh certificate support (#12281) 2020-10-10 20:38:09 -04:00
storage Provide self-registering storage system (#12978) 2020-10-12 23:58:34 -04:00
structs Update golangci-lint to version 1.31.0 (#13102) 2020-10-11 21:27:20 +01:00
svg Fix filepath basename on Windows for SVG bindata (#12241) 2020-07-13 21:16:40 +01:00
sync Fix missing unlock in uniquequeue (#9790) 2020-01-15 23:58:33 +02:00
task Log the underlying panic in runMigrateTask (#13096) 2020-10-11 14:51:13 -04:00
templates Use a simple format for the big number on ui (#12822) 2020-09-16 00:07:18 -04:00
test Macaron 1.5 (#12596) 2020-08-27 22:47:17 -04:00
timeutil Fix timezone on issue deadline (#11697) 2020-06-05 18:51:10 -04:00
upload Update golangci-lint to version 1.31.0 (#13102) 2020-10-11 21:27:20 +01:00
user Add gitea-vet (#10948) 2020-04-05 07:20:50 +01:00
util Update golangci-lint to version 1.31.0 (#13102) 2020-10-11 21:27:20 +01:00
validation [API] Get a single commit via Ref (#10915) 2020-04-07 22:54:46 -04:00
webhook Update golangci-lint to version 1.31.0 (#13102) 2020-10-11 21:27:20 +01:00