From 7b084da00e8af419d4a4da44ccc40ca272d9399e Mon Sep 17 00:00:00 2001 From: zeripath Date: Wed, 17 Apr 2019 05:56:40 +0100 Subject: [PATCH] Add SUBJECT_PREFIX mailer config option (#6605) * Add SUBJECT_PREFIX mailer config option * Add space between subject prefix and subject (Change from Gogs) Signed-off-by: Andrew Thornton --- doc/advanced/config-cheat-sheet.en-us.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/advanced/config-cheat-sheet.en-us.md b/doc/advanced/config-cheat-sheet.en-us.md index 1e97f93e..8ae89ef4 100644 --- a/doc/advanced/config-cheat-sheet.en-us.md +++ b/doc/advanced/config-cheat-sheet.en-us.md @@ -241,14 +241,15 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. - `PASSWD`: **\**: Password of mailing user. Use \`your password\` for quoting if you use special characters in the password. - `SKIP_VERIFY`: **\**: Do not verify the self-signed certificates. - **Note:** Gitea only supports SMTP with STARTTLS. +- `SUBJECT_PREFIX`: **\**: Prefix to be placed before e-mail subject lines. - `MAILER_TYPE`: **smtp**: \[smtp, sendmail, dummy\] - **smtp** Use SMTP to send mail - **sendmail** Use the operating system's `sendmail` command instead of SMTP. This is common on linux systems. - **dummy** Send email messages to the log as a testing phase. - Note that enabling sendmail will ignore all other `mailer` settings except `ENABLED`, - `FROM` and `SENDMAIL_PATH`. - - Enabling dummy will ignore all settings except `ENABLED` and `FROM`. + `FROM`, `SUBJECT_PREFIX` and `SENDMAIL_PATH`. + - Enabling dummy will ignore all settings except `ENABLED`, `SUBJECT_PREFIX` and `FROM`. - `SENDMAIL_PATH`: **sendmail**: The location of sendmail on the operating system (can be command or full path). - ``IS_TLS_ENABLED`` : **false** : Decide if SMTP connections should use TLS.