summaryrefslogtreecommitdiffstats
path: root/custom/conf
diff options
context:
space:
mode:
author6543 <6543@obermui.de>2024-07-14 23:27:00 +0200
committerGergely Nagy <forgejo@gergo.csillger.hu>2024-07-22 15:44:13 +0200
commit004cc6dc0ab7cc9c324ccb4ecd420c6aeeb20500 (patch)
tree07f7f820b716301918a768c4d0b9afb1dca0457e /custom/conf
parentUpgrade xorm to v1.3.9 and improve some migrations Sync (#29899) (diff)
downloadforgejo-004cc6dc0ab7cc9c324ccb4ecd420c6aeeb20500.tar.xz
forgejo-004cc6dc0ab7cc9c324ccb4ecd420c6aeeb20500.zip
Add option to change mail from user display name (#31528)
Make it posible to let mails show e.g.: `Max Musternam (via gitea.kithara.com) <gitea@kithara.com>` Docs: https://gitea.com/gitea/docs/pulls/23 --- *Sponsored by Kithara Software GmbH* (cherry picked from commit 0f533241829d0d48aa16a91e7dc0614fe50bc317) Conflicts: - services/mailer/mail_release.go services/mailer/mail_test.go In both cases, applied the changes manually.
Diffstat (limited to 'custom/conf')
-rw-r--r--custom/conf/app.example.ini4
1 files changed, 4 insertions, 0 deletions
diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index cdb7629887..bbf383b065 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -1727,6 +1727,10 @@ LEVEL = Info
;; Sometimes it is helpful to use a different address on the envelope. Set this to use ENVELOPE_FROM as the from on the envelope. Set to `<>` to send an empty address.
;ENVELOPE_FROM =
;;
+;; If gitea sends mails on behave of users, it will just use the name also displayed in the WebUI. If you want e.g. `Mister X (by CodeIt) <gitea@codeit.net>`,
+;; set it to `{{ .DisplayName }} (by {{ .AppName }})`. Available Variables: `.DisplayName`, `.AppName` and `.Domain`.
+;FROM_DISPLAY_NAME_FORMAT = {{ .DisplayName }}
+;;
;; Mailer user name and password, if required by provider.
;USER =
;;