diff options
| author | Go MAEDA <maeda@farend.jp> | 2018-03-03 04:29:54 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2018-03-03 04:29:54 +0000 |
| commit | 76f12c1316ebcf93bc86ccd449b6032c378cc760 (patch) | |
| tree | 65c3cf6726b3c3a048d296dbeaa1dc10f158e7ec /config | |
| parent | 03c8fc51033ed68920bd74e6caf21d51a2db6f9f (diff) | |
| download | redmine-76f12c1316ebcf93bc86ccd449b6032c378cc760.tar.gz redmine-76f12c1316ebcf93bc86ccd449b6032c378cc760.zip | |
Optional regex for filtering attachments on incoming emails (#27025).
Patch by Jan Schulz-Hofen.
git-svn-id: http://svn.redmine.org/redmine/trunk@17225 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 2 | ||||
| -rw-r--r-- | config/settings.yml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 9a44dcc12..018235a3d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -414,7 +414,7 @@ en: setting_display_subprojects_issues: Display subprojects issues on main projects by default setting_enabled_scm: Enabled SCM setting_mail_handler_body_delimiters: "Truncate emails after one of these lines" - setting_mail_handler_enable_regex_delimiters: "Enable regular expressions" + 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_sys_api_key: Repository management WS API key diff --git a/config/settings.yml b/config/settings.yml index c997c2900..10f8c4b7b 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -185,6 +185,8 @@ mail_handler_body_delimiters: default: '' mail_handler_enable_regex_delimiters: default: 0 +mail_handler_enable_regex_excluded_filenames: + default: 0 mail_handler_excluded_filenames: default: '' mail_handler_api_enabled: |