diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-29 12:05:23 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-29 12:05:23 +0000 |
| commit | d8eee8ed73de13a5af42a5cf6de8ec1194e45483 (patch) | |
| tree | 4861b64cb35b8bdaa53f3b07427c455e748e1441 /app/views | |
| parent | 35212deb062dda60220a9a0929c26196c1c598b5 (diff) | |
| parent | b62e2bedbfa49aacfc4847049aa589f045af15ce (diff) | |
| download | gitlab-ce-d8eee8ed73de13a5af42a5cf6de8ec1194e45483.tar.gz | |
Merge branch '24880-configurable-plaintext-emails' into 'master'
Add setting to enable/disable HTML emails
Closes #24880
See merge request !7749
Diffstat (limited to 'app/views')
| -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 |