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/controllers | |
| 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/controllers')
| -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, |