web/forgejo
9
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-06-22 13:18:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Allow options to disable user gpg keys configuration from the interface on app.ini (#29486)

Browse source 
Follow #29447
Fix #29454
Extract from #20549

(cherry picked from commit 9de5e39e25009bacc5ca201ed97e9cbb623e56e9)

Conflicts:
	custom/conf/app.example.ini
	docs/content/administration/config-cheat-sheet.en-us.md
	docs/content/administration/config-cheat-sheet.zh-cn.md
	trivial context conflict
This commit is contained in:
Lunny Xiao 2024-03-02 09:21:01 +08:00 • committed by Earl Warren
parent 85bf170ff0
commit ee6ff937c0
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
7 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
templates/user/settings/keys.tmpl
View file

@ -2,6 +2,8 @@
<div class="user-setting-content">
{{template "user/settings/keys_ssh" .}}
{{template "user/settings/keys_principal" .}}
{{if not ($.UserDisabledFeatures.Contains "manage_gpg_keys")}}
{{template "user/settings/keys_gpg" .}}
{{end}}
</div>
{{template "user/settings/layout_footer" .}}