diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
| commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
| tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /config/smime_signature_settings.rb | |
| parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) | |
| download | gitlab-ce-9f46488805e86b1bc341ea1620b866016c2ce5ed.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
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 |