diff options
| author | zeripath <art27@cantab.net> | 2019-12-15 11:06:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-15 11:06:31 +0000 |
| commit | 3abe17f9e088d24eff4f4e3b98a6c555db334202 (patch) | |
| tree | fdfe7f04e4cb200b7a0a3b93726a85970dc95970 /custom/conf/app.ini.sample | |
| parent | e3c3b33ea7a5a223e22688c3f0eb2d3dab9f991c (diff) | |
| download | gitea-3abe17f9e088d24eff4f4e3b98a6c555db334202.tar.gz gitea-3abe17f9e088d24eff4f4e3b98a6c555db334202.zip | |
Sign protected branches (#8993)
* Move SignMerge to PullRequest
* Add approved signing mode
* As per @guillep2k comment
Diffstat (limited to 'custom/conf/app.ini.sample')
| -rw-r--r-- | custom/conf/app.ini.sample | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample index 76889484b5..701374d4b8 100644 --- a/custom/conf/app.ini.sample +++ b/custom/conf/app.ini.sample @@ -110,6 +110,7 @@ WIKI = never ; Determines when to sign on merges ; - basesigned: require that the parent of commit on the base repo is signed. ; - commitssigned: require that all the commits in the head branch are signed. +; - approved: only sign when merging an approved pr to a protected branch MERGES = pubkey, twofa, basesigned, commitssigned [cors] |