diff options
| author | zeripath <art27@cantab.net> | 2020-01-15 08:32:57 +0000 |
|---|---|---|
| committer | Antoine GIRARD <sapk@users.noreply.github.com> | 2020-01-15 09:32:57 +0100 |
| commit | 66ee9b87f9aaabef836ec72bfaf8032b359b29c1 (patch) | |
| tree | b6d134fb5ccc83c4b7ddad6a0eb6206496cc8b76 /templates/repo/settings | |
| parent | 6b1fa1235904947187266789b204f19bc03872be (diff) | |
| download | gitea-66ee9b87f9aaabef836ec72bfaf8032b359b29c1.tar.gz gitea-66ee9b87f9aaabef836ec72bfaf8032b359b29c1.zip | |
Add require signed commit for protected branch (#9708)
* Add require signed commit for protected branch
* Fix fmt
* Make editor show if they will be signed
* bugfix
* Add basic merge check and better information for CRUD
* linting comment
* Add descriptors to merge signing
* Slight refactor
* Slight improvement to appearances
* Handle Merge API
* manage CRUD API
* Move error to error.go
* Remove fix to delete.go
* prep for merge
* need to tolerate \r\n in message
* check protected branch before trying to load it
* Apply suggestions from code review
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
* fix commit-reader
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Diffstat (limited to 'templates/repo/settings')
| -rw-r--r-- | templates/repo/settings/protected_branch.tmpl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl index c6701ce8a9..b4c65f7830 100644 --- a/templates/repo/settings/protected_branch.tmpl +++ b/templates/repo/settings/protected_branch.tmpl @@ -210,7 +210,7 @@ <label for="block_on_rejected_reviews">{{.i18n.Tr "repo.settings.block_rejected_reviews"}}</label> <p class="help">{{.i18n.Tr "repo.settings.block_rejected_reviews_desc"}}</p> </div> - </div> + </div> <div class="field"> <div class="ui checkbox"> <input name="dismiss_stale_approvals" type="checkbox" {{if .Branch.DismissStaleApprovals}}checked{{end}}> @@ -218,6 +218,13 @@ <p class="help">{{.i18n.Tr "repo.settings.dismiss_stale_approvals_desc"}}</p> </div> </div> + <div class="field"> + <div class="ui checkbox"> + <input name="require_signed_commits" type="checkbox" {{if .Branch.RequireSignedCommits}}checked{{end}}> + <label for="require_signed_commits">{{.i18n.Tr "repo.settings.require_signed_commits"}}</label> + <p class="help">{{.i18n.Tr "repo.settings.require_signed_commits_desc"}}</p> + </div> + </div> </div> |