aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2024-03-04 15:50:21 +0800
committerGitHub <noreply@github.com>2024-03-04 07:50:21 +0000
commit8e12ba34bab7e728ac93ccfaecbe91e053ef1c89 (patch)
treeed8b8a77e90fd3b29cfb93adaf89e6840efe90a6 /docs
parentd769b664dedb5f63b73146b58b21c0a772c2630d (diff)
downloadgitea-8e12ba34bab7e728ac93ccfaecbe91e053ef1c89.tar.gz
gitea-8e12ba34bab7e728ac93ccfaecbe91e053ef1c89.zip
Allow options to disable user ssh keys configuration from the interface on app.ini (#29447)
Follow #29275 Extract from #20549 Fix #24716 --------- Co-authored-by: delvh <dev.lh@web.de>
Diffstat (limited to 'docs')
-rw-r--r--docs/content/administration/config-cheat-sheet.en-us.md5
-rw-r--r--docs/content/administration/config-cheat-sheet.zh-cn.md5
2 files changed, 6 insertions, 4 deletions
diff --git a/docs/content/administration/config-cheat-sheet.en-us.md b/docs/content/administration/config-cheat-sheet.en-us.md
index ea6e1eb1a4..8a01711949 100644
--- a/docs/content/administration/config-cheat-sheet.en-us.md
+++ b/docs/content/administration/config-cheat-sheet.en-us.md
@@ -518,9 +518,10 @@ And the following unique queues:
- `DEFAULT_EMAIL_NOTIFICATIONS`: **enabled**: Default configuration for email notifications for users (user configurable). Options: enabled, onmention, disabled
- `DISABLE_REGULAR_ORG_CREATION`: **false**: Disallow regular (non-admin) users from creating organizations.
-- `USER_DISABLED_FEATURES`: **_empty_** Disabled features for users, could be `deletion`, `manage_gpg_keys` and more features can be added in future.
+- `USER_DISABLED_FEATURES`: **_empty_** Disabled features for users, could be `deletion`, `manage_ssh_keys`, `manage_gpg_keys` and more features can be added in future.
- `deletion`: User cannot delete their own account.
- - `manage_gpg_keys`: User cannot configure gpg keys
+ - `manage_ssh_keys`: User cannot configure ssh keys.
+ - `manage_gpg_keys`: User cannot configure gpg keys.
## Security (`security`)
diff --git a/docs/content/administration/config-cheat-sheet.zh-cn.md b/docs/content/administration/config-cheat-sheet.zh-cn.md
index 5cc5734359..7b102eda8e 100644
--- a/docs/content/administration/config-cheat-sheet.zh-cn.md
+++ b/docs/content/administration/config-cheat-sheet.zh-cn.md
@@ -497,9 +497,10 @@ Gitea 创建以下非唯一队列:
- `DEFAULT_EMAIL_NOTIFICATIONS`: **enabled**:用户电子邮件通知的默认配置(用户可配置)。选项:enabled、onmention、disabled
- `DISABLE_REGULAR_ORG_CREATION`: **false**:禁止普通(非管理员)用户创建组织。
-- `USER_DISABLED_FEATURES`:**_empty_** 禁用的用户特性,当前允许为空或者 `deletion`,`manage_gpg_keys` 未来可以增加更多设置。
+- `USER_DISABLED_FEATURES`:**_empty_** 禁用的用户特性,当前允许为空或者 `deletion`,`manage_ssh_keys`, `manage_gpg_keys` 未来可以增加更多设置。
- `deletion`: 用户不能通过界面或者API删除他自己。
- - `manage_gpg_keys`: 用户不能配置 GPG 密钥
+ - `manage_ssh_keys`: 用户不能通过界面或者API配置SSH Keys。
+ - `manage_gpg_keys`: 用户不能配置 GPG 密钥。
## 安全性 (`security`)