Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 4 deletions

diff --git a/lib/gitlab/x509/signature.rb b/lib/gitlab/x509/signature.rb
index edff1540cb3..c83213e973b 100644
--- a/lib/gitlab/x509/signature.rb
+++ b/lib/gitlab/x509/signature.rb
@@ -72,7 +72,7 @@ module Gitlab
           pkcs7_text = pkcs7_text.sub('-----END SIGNED MESSAGE-----', '-----END PKCS7-----')
 
           OpenSSL::PKCS7.new(pkcs7_text)
-        rescue
+        rescue StandardError
           nil
         end
       end
@@ -87,7 +87,7 @@ module Gitlab
 
       def valid_signature?
         p7.verify([], cert_store, signed_text, OpenSSL::PKCS7::NOVERIFY)
-      rescue
+      rescue StandardError
         nil
       end
 
@@ -104,7 +104,7 @@ module Gitlab
         else
           nil
         end
-      rescue
+      rescue StandardError
         nil
       end
 
diff --git a/lib/gitlab/x509/tag.rb b/lib/gitlab/x509/tag.rb
index 48582c17764..ad85b200130 100644
--- a/lib/gitlab/x509/tag.rb
+++ b/lib/gitlab/x509/tag.rb
@@ -23,7 +23,7 @@ module Gitlab
 
       def signature_text
         @raw_tag.message.slice(@raw_tag.message.index("-----BEGIN SIGNED MESSAGE-----")..-1)
-      rescue
+      rescue StandardError
         nil
       end