From 3d6cb25e315c0d4249c5c749a2eb8c64ec463aad Mon Sep 17 00:00:00 2001 From: Jimmy Praet Date: Sat, 11 Sep 2021 16:21:17 +0200 Subject: Support unprotected file patterns (#16395) Fixes #16381 Note that changes to unprotected files via the web editor still cannot be pushed directly to the protected branch. I could easily add such support for edits and deletes if needed. But for adding, uploading or renaming unprotected files, it is not trivial. * Extract & Move GetAffectedFiles to modules/git --- routers/api/v1/repo/branch.go | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'routers/api/v1/repo') diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index 8653b0bc80..c57075e3b8 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -498,6 +498,7 @@ func CreateBranchProtection(ctx *context.APIContext) { DismissStaleApprovals: form.DismissStaleApprovals, RequireSignedCommits: form.RequireSignedCommits, ProtectedFilePatterns: form.ProtectedFilePatterns, + UnprotectedFilePatterns: form.UnprotectedFilePatterns, BlockOnOutdatedBranch: form.BlockOnOutdatedBranch, } @@ -643,6 +644,10 @@ func EditBranchProtection(ctx *context.APIContext) { protectBranch.ProtectedFilePatterns = *form.ProtectedFilePatterns } + if form.UnprotectedFilePatterns != nil { + protectBranch.UnprotectedFilePatterns = *form.UnprotectedFilePatterns + } + if form.BlockOnOutdatedBranch != nil { protectBranch.BlockOnOutdatedBranch = *form.BlockOnOutdatedBranch } -- cgit v1.2.3