From e33f87ac0fabaab468ce4b457996cc0f1b1bb648 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 21 Apr 2020 15:21:10 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/smime_signature_settings.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'config/smime_signature_settings.rb') 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 -- cgit v1.2.3