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 /docs | |
| 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 'docs')
| -rw-r--r-- | docs/content/doc/advanced/config-cheat-sheet.en-us.md | 3 | ||||
| -rw-r--r-- | docs/content/doc/advanced/signing.en-us.md | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index 4174a87471..36e56c3fed 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -96,7 +96,8 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. - `CRUD_ACTIONS`: **pubkey, twofa, parentsigned**: \[never, pubkey, twofa, parentsigned, always\]: Sign CRUD actions. - Options as above, with the addition of: - `parentsigned`: Only sign if the parent commit is signed. -- `MERGES`: **pubkey, twofa, basesigned, commitssigned**: \[never, pubkey, twofa, basesigned, commitssigned, always\]: Sign merges. +- `MERGES`: **pubkey, twofa, basesigned, commitssigned**: \[never, pubkey, twofa, approved, basesigned, commitssigned, always\]: Sign merges. + - `approved`: Only sign approved merges to a protected branch. - `basesigned`: Only sign if the parent commit in the base repo is signed. - `headsigned`: Only sign if the head commit in the head branch is signed. - `commitssigned`: Only sign if all the commits in the head branch to the merge point are signed. diff --git a/docs/content/doc/advanced/signing.en-us.md b/docs/content/doc/advanced/signing.en-us.md index b6c99e269e..72d294e7bd 100644 --- a/docs/content/doc/advanced/signing.en-us.md +++ b/docs/content/doc/advanced/signing.en-us.md @@ -136,6 +136,7 @@ The possible options are: * `basesigned`: Only sign if the parent commit in the base repo is signed. * `headsigned`: Only sign if the head commit in the head branch is signed. * `commitssigned`: Only sign if all the commits in the head branch to the merge point are signed. +* `approved`: Only sign approved merges to a protected branch. * `always`: Always sign Options other than `never` and `always` can be combined as a comma |