Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 2 insertions, 2 deletions

diff --git a/app/models/concerns/x509_serial_number_attribute.rb b/app/models/concerns/x509_serial_number_attribute.rb
index d2a5c736604..dbba80eff53 100644
--- a/app/models/concerns/x509_serial_number_attribute.rb
+++ b/app/models/concerns/x509_serial_number_attribute.rb
@@ -31,9 +31,9 @@ module X509SerialNumberAttribute
       end
 
       unless column.type == :binary
-        raise ArgumentError.new("x509_serial_number_attribute #{name.inspect} is invalid since the column type is not :binary")
+        raise ArgumentError, "x509_serial_number_attribute #{name.inspect} is invalid since the column type is not :binary"
       end
-    rescue => error
+    rescue StandardError => error
       Gitlab::AppLogger.error "X509SerialNumberAttribute initialization: #{error.message}"
       raise
     end