summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml1
-rw-r--r--config/settings.yml2
2 files changed, 3 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 38447e067..8995800c3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -422,6 +422,7 @@ en:
setting_mail_handler_enable_regex: "Enable regular expressions"
setting_mail_handler_api_enabled: Enable WS for incoming emails
setting_mail_handler_api_key: Incoming email WS API key
+ setting_mail_handler_preferred_body_part: Preferred part of multipart (HTML) emails
setting_sys_api_key: Repository management WS API key
setting_sequential_project_identifiers: Generate sequential project identifiers
setting_gravatar_enabled: Use Gravatar user icons
diff --git a/config/settings.yml b/config/settings.yml
index e0f49ea2b..4ae9c7487 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -195,6 +195,8 @@ mail_handler_api_enabled:
mail_handler_api_key:
default:
security_notifications: 1
+mail_handler_preferred_body_part:
+ default: plain
issue_list_default_columns:
serialized: true
default: