diff options
| author | Jacopo <beschi.jacopo@gmail.com> | 2017-11-14 10:02:39 +0100 |
|---|---|---|
| committer | Jacopo <beschi.jacopo@gmail.com> | 2017-11-16 17:58:29 +0100 |
| commit | 181cd299f9e06223e8338e93b1c318c671ccb1aa (patch) | |
| tree | 0d71dcf3f786496eaa46b9d65ce2626f162015da /app/validators | |
| parent | f2997af4d5cdec3266d3178edeedc36d4e590062 (diff) | |
| download | gitlab-ce-181cd299f9e06223e8338e93b1c318c671ccb1aa.tar.gz | |
Adds Rubocop rule for line break after guard clause
Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses.
Diffstat (limited to 'app/validators')
| -rw-r--r-- | app/validators/certificate_key_validator.rb | 1 | ||||
| -rw-r--r-- | app/validators/certificate_validator.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/validators/certificate_key_validator.rb b/app/validators/certificate_key_validator.rb index 098b16017d2..8c7bb750339 100644 --- a/app/validators/certificate_key_validator.rb +++ b/app/validators/certificate_key_validator.rb @@ -17,6 +17,7 @@ class CertificateKeyValidator < ActiveModel::EachValidator def valid_private_key_pem?(value) return false unless value + pkey = OpenSSL::PKey::RSA.new(value) pkey.private? rescue OpenSSL::PKey::PKeyError diff --git a/app/validators/certificate_validator.rb b/app/validators/certificate_validator.rb index e3d18097f71..5239e70a326 100644 --- a/app/validators/certificate_validator.rb +++ b/app/validators/certificate_validator.rb @@ -17,6 +17,7 @@ class CertificateValidator < ActiveModel::EachValidator def valid_certificate_pem?(value) return false unless value + OpenSSL::X509::Certificate.new(value).present? rescue OpenSSL::X509::CertificateError false |