diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-12-13 18:46:29 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-12-13 18:46:29 +0000 |
| commit | f30462595e83f512cd5f29246a4542773595a224 (patch) | |
| tree | 56eb7ce08ea5a8c6e0c21806e067c8c652e652b9 /app/views/settings | |
| parent | 3186130966cea85d842faf5c038006f8fb40bb61 (diff) | |
| download | redmine-f30462595e83f512cd5f29246a4542773595a224.tar.gz redmine-f30462595e83f512cd5f29246a4542773595a224.zip | |
Optional Regex delimiters to truncate incoming emails (#5864).
git-svn-id: http://svn.redmine.org/redmine/trunk@16065 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/settings')
| -rw-r--r-- | app/views/settings/_mail_handler.html.erb | 1 | ||||
| -rw-r--r-- | app/views/settings/edit.html.erb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/app/views/settings/_mail_handler.html.erb b/app/views/settings/_mail_handler.html.erb index f255b4adc..02dfe5264 100644 --- a/app/views/settings/_mail_handler.html.erb +++ b/app/views/settings/_mail_handler.html.erb @@ -3,6 +3,7 @@ <div class="box tabular settings"> <p> <%= setting_text_area :mail_handler_body_delimiters, :rows => 5 %> + <%= setting_check_box :mail_handler_enable_regex_delimiters, :label => false %> <%= l(:setting_mail_handler_enable_regex_delimiters) %> <em class="info"><%= l(:text_line_separated) %></em> </p> <p> diff --git a/app/views/settings/edit.html.erb b/app/views/settings/edit.html.erb index de64e3bb2..3db255e29 100644 --- a/app/views/settings/edit.html.erb +++ b/app/views/settings/edit.html.erb @@ -1,5 +1,7 @@ <h2><%= l(:label_settings) %></h2> +<%= render_settings_error @setting_errors %> + <%= render_tabs administration_settings_tabs %> <% html_title(l(:label_settings), l(:label_administration)) -%> |