Download as
Browse Code »

Commit 1d6f4a6079f2bbace5a1ac1731240fe21a9f434f

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

Merge branch 'allow_smtp_false_attribute' into 'master' 

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