This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit f7f32191192859eb6a4c59ee3e6ee9edf2ed1529
Author: Sam Ruby <[email protected]>
AuthorDate: Fri Nov 17 20:43:43 2017 -0500

    accept attachments with names ending in .pdf.asc even if they
    have an excluded mime type
---
 www/secretary/workbench/models/message.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/secretary/workbench/models/message.rb 
b/www/secretary/workbench/models/message.rb
index 327d0ee..4cc72f3 100644
--- a/www/secretary/workbench/models/message.rb
+++ b/www/secretary/workbench/models/message.rb
@@ -105,7 +105,8 @@ class Message
     attachments = headers[:attachments]
     return [] unless attachments
     attachments.
-      reject {|attachment| SIG_MIMES.include? attachment[:mime]}.
+      reject {|attachment| SIG_MIMES.include?(attachment[:mime]) and
+        (not attachment[:name] or attachment[:name] !~ /\.pdf\.asc$/)}.
       map {|attachment| attachment[:name]}.
       select {|name| name != 'signature.asc'}
   end

-- 
To stop receiving notification emails like this one, please contact
"[email protected]" <[email protected]>.

Reply via email to