diff options
| author | Jimmy Praet <jimmy.praet@telenet.be> | 2021-09-11 16:21:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-11 16:21:17 +0200 |
| commit | 3d6cb25e315c0d4249c5c749a2eb8c64ec463aad (patch) | |
| tree | bf9ba30a34e0e97b6a52584caffa1d3d9fe2506d /templates | |
| parent | eb03e819d323f6374d0a99a5b80d4674a18fa957 (diff) | |
| download | gitea-3d6cb25e315c0d4249c5c749a2eb8c64ec463aad.tar.gz gitea-3d6cb25e315c0d4249c5c749a2eb8c64ec463aad.zip | |
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
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/settings/protected_branch.tmpl | 5 | ||||
| -rw-r--r-- | templates/swagger/v1_json.tmpl | 12 |
2 files changed, 17 insertions, 0 deletions
diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl index f6ecd67fd2..597567f057 100644 --- a/templates/repo/settings/protected_branch.tmpl +++ b/templates/repo/settings/protected_branch.tmpl @@ -244,6 +244,11 @@ <input name="protected_file_patterns" id="protected_file_patterns" type="text" value="{{.Branch.ProtectedFilePatterns}}"> <p class="help">{{.i18n.Tr "repo.settings.protect_protected_file_patterns_desc" | Safe}}</p> </div> + <div class="field"> + <label for="unprotected_file_patterns">{{.i18n.Tr "repo.settings.protect_unprotected_file_patterns"}}</label> + <input name="unprotected_file_patterns" id="unprotected_file_patterns" type="text" value="{{.Branch.UnprotectedFilePatterns}}"> + <p class="help">{{.i18n.Tr "repo.settings.protect_unprotected_file_patterns_desc" | Safe}}</p> + </div> </div> diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index 90a32e28af..e99e092843 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -12387,6 +12387,10 @@ }, "x-go-name": "StatusCheckContexts" }, + "unprotected_file_patterns": { + "type": "string", + "x-go-name": "UnprotectedFilePatterns" + }, "updated_at": { "type": "string", "format": "date-time", @@ -12834,6 +12838,10 @@ "type": "string" }, "x-go-name": "StatusCheckContexts" + }, + "unprotected_file_patterns": { + "type": "string", + "x-go-name": "UnprotectedFilePatterns" } }, "x-go-package": "code.gitea.io/gitea/modules/structs" @@ -13836,6 +13844,10 @@ "type": "string" }, "x-go-name": "StatusCheckContexts" + }, + "unprotected_file_patterns": { + "type": "string", + "x-go-name": "UnprotectedFilePatterns" } }, "x-go-package": "code.gitea.io/gitea/modules/structs" |