From f30462595e83f512cd5f29246a4542773595a224 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 13 Dec 2016 18:46:29 +0000
Subject: Optional Regex delimiters to truncate incoming emails (#5864).

git-svn-id: http://svn.redmine.org/redmine/trunk@16065 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/settings/_mail_handler.html.erb | 1 +
 app/views/settings/edit.html.erb          | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'app/views/settings')

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)) -%>
-- 
cgit v1.2.3