diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2016-11-28 17:00:03 -0500 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-11-28 17:00:03 -0500 |
| commit | b62e2bedbfa49aacfc4847049aa589f045af15ce (patch) | |
| tree | 6bf1896177f66219f019beda752261fa7b99cea1 /app/views/admin | |
| parent | 5c6d3a99efa1d29291f0b58655d9fc7febb970f8 (diff) | |
| download | gitlab-ce-b62e2bedbfa49aacfc4847049aa589f045af15ce.tar.gz | |
Add new configuration setting to enable/disable HTML emails.24880-configurable-plaintext-emails
This new global setting will allow admins to specify if HTML emails should be sent or not,
this is basically useful when system administrators want to save some disk space by avoiding
emails in HTML format and using only the Plain Text version.
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index ce803f329f9..7accd2529af 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -443,7 +443,16 @@ Some email servers do not support overriding the email sender name. Enable this option to include the name of the author of the issue, merge request or comment in the email body instead. - + .form-group + .col-sm-offset-2.col-sm-10 + .checkbox + = f.label :html_emails_enabled do + = f.check_box :html_emails_enabled + Enable HTML emails + .help-block + By default GitLab sends emails in HTML and plain text formats so mail + clients can choose what format to use. Disable this option if you only + want to send emails in plain text format. %fieldset %legend Automatic Git repository housekeeping .form-group |