[whimsy] branch master updated: Revert "Revert "Allow for .sig as well as .asc attachment""

[sebb]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 9118c91  Revert "Revert "Allow for .sig as well as .asc attachment""
9118c91 is described below

commit 9118c9187f5dc234f5c659caf54e90a7301bb4e3
Author: Sebb <s...@apache.org>
AuthorDate: Fri Oct 19 00:20:35 2018 +0100

    Revert "Revert "Allow for .sig as well as .asc attachment""
    
    This reverts commit 0276eede56617c7cde861c61347f555f7e933a5f.
---
 www/secretary/workbench/models/message.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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