From 3e15e34a611f2c206c979befe51fc25f036fd033 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Mon, 14 Jul 2014 18:31:49 +0200 Subject: [PATCH] Only reject SMTP attributes which are nil --- CHANGELOG | 1 + files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 3f73a26..6d19832 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,7 @@ omnibus-gitlab repository. - Add support for the LDAP admin_group attribute (GitLab EE) - Fix TLS issue in SMTP email configuration (provides new attribute tls) (Ricardo Langner) - Support external Redis instances (sponsored by O'Reilly Media) +- Only reject SMTP attributes which are nil 7.0.0-ee.omnibus.1 - Fix MySQL build for Ubuntu 14.04 diff --git a/files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb b/files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb index 05671bd..d972f3c 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb +++ b/files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb @@ -8,7 +8,8 @@ if Rails.env.production? ActionMailer::Base.smtp_settings = { authentication: <%= @smtp_authentication.to_s.to_sym.inspect %>, <% %w{ address port user_name password domain enable_starttls_auto tls }.each do |key| %> - <% if value = node['gitlab']['gitlab-rails']["smtp_#{key}"] %> + <% value = node['gitlab']['gitlab-rails']["smtp_#{key}"] %> + <% unless value.nil? %> <%= "#{key}: #{value.inspect}," %> <% end %> <% end %> -- libgit2 0.21.2