error reply for failed incoming email (#10726)
* error reply for failed incoming email * deprecated date.to_s(:db) replaced with to_fs(:db) * rubocop concessions * nest away * do not report errors to unknown users by default * use verifying doublepull/10754/head
parent
f7a88f7cd9
commit
d5f00b5700
@ -0,0 +1,50 @@ |
||||
<%#-- copyright |
||||
OpenProject is an open source project management software. |
||||
Copyright (C) 2012-2022 the OpenProject GmbH |
||||
|
||||
This program is free software; you can redistribute it and/or |
||||
modify it under the terms of the GNU General Public License version 3. |
||||
|
||||
OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: |
||||
Copyright (C) 2006-2013 Jean-Philippe Lang |
||||
Copyright (C) 2010-2013 the ChiliProject Team |
||||
|
||||
This program is free software; you can redistribute it and/or |
||||
modify it under the terms of the GNU General Public License |
||||
as published by the Free Software Foundation; either version 2 |
||||
of the License, or (at your option) any later version. |
||||
|
||||
This program is distributed in the hope that it will be useful, |
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
GNU General Public License for more details. |
||||
|
||||
You should have received a copy of the GNU General Public License |
||||
along with this program; if not, write to the Free Software |
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||
|
||||
See COPYRIGHT and LICENSE files for more details. |
||||
|
||||
++#%> |
||||
|
||||
<h2><%= t(:mail_body_incoming_email_error) %></h2> |
||||
|
||||
<p> |
||||
<%= t(:mail_body_incoming_email_error_logs) %>: |
||||
</p> |
||||
|
||||
<code> |
||||
<%= @logs.join("\n") %> |
||||
</code> |
||||
|
||||
<p> |
||||
<%= t( |
||||
:mail_body_incoming_email_error_in_reply_to, |
||||
received_at: format_time(@received_at), |
||||
from_email: @mail.from.first |
||||
)%>: |
||||
</p> |
||||
|
||||
<blockquote> |
||||
<%= @incoming_text %> |
||||
</blockquote> |
@ -0,0 +1,42 @@ |
||||
<%#-- copyright |
||||
OpenProject is an open source project management software. |
||||
Copyright (C) 2012-2022 the OpenProject GmbH |
||||
|
||||
This program is free software; you can redistribute it and/or |
||||
modify it under the terms of the GNU General Public License version 3. |
||||
|
||||
OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: |
||||
Copyright (C) 2006-2013 Jean-Philippe Lang |
||||
Copyright (C) 2010-2013 the ChiliProject Team |
||||
|
||||
This program is free software; you can redistribute it and/or |
||||
modify it under the terms of the GNU General Public License |
||||
as published by the Free Software Foundation; either version 2 |
||||
of the License, or (at your option) any later version. |
||||
|
||||
This program is distributed in the hope that it will be useful, |
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
GNU General Public License for more details. |
||||
|
||||
You should have received a copy of the GNU General Public License |
||||
along with this program; if not, write to the Free Software |
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||
|
||||
See COPYRIGHT and LICENSE files for more details. |
||||
|
||||
++#%> |
||||
|
||||
<%= t(:mail_body_incoming_email_error) %> |
||||
|
||||
<%= t(:mail_body_incoming_email_error_logs) %>: |
||||
|
||||
<%= @logs.join("\n") %> |
||||
|
||||
<%= t( |
||||
:mail_body_incoming_email_error_in_reply_to, |
||||
received_at: format_time(@received_at), |
||||
from_email: @mail.from.first |
||||
)%>: |
||||
|
||||
<%= @quote %> |
Loading…
Reference in new issue