diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-21 18:21:10 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-21 18:21:10 +0300 |
| commit | e33f87ac0fabaab468ce4b457996cc0f1b1bb648 (patch) | |
| tree | 8bf0de72a9acac014cfdaddab7d463b208294af2 /config/smime_signature_settings.rb | |
| parent | 5baf990db20a75078684702782c24399ef9eb0fa (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/smime_signature_settings.rb')
| -rw-r--r-- | config/smime_signature_settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/smime_signature_settings.rb b/config/smime_signature_settings.rb index 3d19db84c19..4a8cf1a06f7 100644 --- a/config/smime_signature_settings.rb +++ b/config/smime_signature_settings.rb @@ -5,6 +5,7 @@ class SmimeSignatureSettings email_smime['enabled'] = false unless email_smime['enabled'] email_smime['key_file'] ||= Rails.root.join('.gitlab_smime_key') email_smime['cert_file'] ||= Rails.root.join('.gitlab_smime_cert') + email_smime['ca_certs_file'] ||= nil email_smime end |