Download as
Browse Code »

Commit 3e15e34a611f2c206c979befe51fc25f036fd033

Authored by Jacob Vosmaer
1 parent a892fa69
Exists in master and in 4 other branches 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee

Only reject SMTP attributes which are nil

Showing 2 changed files with 3 additions and 1 deletions   Show diff stats
CHANGELOG
  Diff comments   View file @3e15e34
... ... @@ -12,6 +12,7 @@ omnibus-gitlab repository.
12 12 - Add support for the LDAP admin_group attribute (GitLab EE)
13 13 - Fix TLS issue in SMTP email configuration (provides new attribute tls) (Ricardo Langner)
14 14 - Support external Redis instances (sponsored by O'Reilly Media)
  15 +- Only reject SMTP attributes which are nil
15 16  
16 17 7.0.0-ee.omnibus.1
17 18 - Fix MySQL build for Ubuntu 14.04
... ...
files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb
  Diff comments   View file @3e15e34
... ... @@ -8,7 +8,8 @@ if Rails.env.production?
8 8 ActionMailer::Base.smtp_settings = {
9 9 authentication: <%= @smtp_authentication.to_s.to_sym.inspect %>,
10 10 <% %w{ address port user_name password domain enable_starttls_auto tls }.each do |key| %>
11   - <% if value = node['gitlab']['gitlab-rails']["smtp_#{key}"] %>
  11 + <% value = node['gitlab']['gitlab-rails']["smtp_#{key}"] %>
  12 + <% unless value.nil? %>
12 13 <%= "#{key}: #{value.inspect}," %>
13 14 <% end %>
14 15 <% end %>
... ...