summaryrefslogtreecommitdiffstats
path: root/app/views/settings
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2018-03-03 04:29:54 +0000
committerGo MAEDA <maeda@farend.jp>2018-03-03 04:29:54 +0000
commit76f12c1316ebcf93bc86ccd449b6032c378cc760 (patch)
tree65c3cf6726b3c3a048d296dbeaa1dc10f158e7ec /app/views/settings
parent03c8fc51033ed68920bd74e6caf21d51a2db6f9f (diff)
downloadredmine-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 'app/views/settings')
-rw-r--r--app/views/settings/_mail_handler.html.erb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/settings/_mail_handler.html.erb b/app/views/settings/_mail_handler.html.erb
index 3e1a40d1d..36fa864bb 100644
--- a/app/views/settings/_mail_handler.html.erb
+++ b/app/views/settings/_mail_handler.html.erb
@@ -5,12 +5,16 @@
<%= setting_text_area :mail_handler_body_delimiters, :rows => 5 %>
<label class="block">
<%= setting_check_box :mail_handler_enable_regex_delimiters, :label => false %>
- <%= l(:setting_mail_handler_enable_regex_delimiters) %>
+ <%= l(:setting_mail_handler_enable_regex) %>
</label>
<em class="info"><%= l(:text_line_separated) %></em>
</p>
<p>
<%= setting_text_field :mail_handler_excluded_filenames, :size => 60 %>
+ <label class="block">
+ <%= setting_check_box :mail_handler_enable_regex_excluded_filenames, :label => false %>
+ <%= l(:setting_mail_handler_enable_regex) %>
+ </label>
<em class="info"><%= l(:text_comma_separated) %>
<%= l(:label_example) %>: smime.p7s, *.vcf</em>
</p>