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/controllers/admin/application_settings_controller.rb | |
| 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/controllers/admin/application_settings_controller.rb')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index b81842e319b..c2bb8464824 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -112,6 +112,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :koding_enabled, :koding_url, :email_author_in_body, + :html_emails_enabled, :repository_checks_enabled, :metrics_packet_size, :send_user_confirmation_email, |