diff options
| author | Azul <azul@leap.se> | 2013-03-05 13:35:05 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-03-05 13:35:05 +0100 |
| commit | 27c16ccceffa1d8eaaf02612cf29a60bfe6ced01 (patch) | |
| tree | 1df9d9900872cf2e97d5c27b4175816eff5cbf80 /certs/app | |
| parent | 733426aa3992dafaf1c58ede7e74018057a01148 (diff) | |
| parent | 87c306ea212c01ecc8f98009def5971fc4d5af11 (diff) | |
Merge branch 'master' into feature/limit_user_leak
Conflicts:
users/lib/warden/strategies/secure_remote_password.rb
Diffstat (limited to 'certs/app')
| -rw-r--r-- | certs/app/models/client_certificate.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/certs/app/models/client_certificate.rb b/certs/app/models/client_certificate.rb index 1bc34c6..13e0318 100644 --- a/certs/app/models/client_certificate.rb +++ b/certs/app/models/client_certificate.rb @@ -66,8 +66,7 @@ class ClientCertificate end def common_name(for_free_cert = false) - random_common_name + - (for_free_cert ? APP_CONFIG[:free_cert_postfix] : '') + (for_free_cert ? APP_CONFIG[:free_cert_prefix] : '') + random_common_name end # |