From 0e78bd840449a26fb3c906a4dd9454fd3b94c5fc Mon Sep 17 00:00:00 2001
From: Ricardo Langner <ricardo.langner@gmail.com>
Date: Wed, 25 Jun 2014 20:00:45 +0200
Subject: [PATCH] - Allows smtp parameter tls. This adds the solution for the gitlabhq issue #5636

---
 files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a407bc2..05671bd 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb
@@ -7,7 +7,7 @@ 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 }.each do |key| %>
+<% %w{ address port user_name password domain enable_starttls_auto tls }.each do |key| %>
   <% if value = node['gitlab']['gitlab-rails']["smtp_#{key}"] %>
     <%= "#{key}: #{value.inspect}," %>
   <% end %>
--
libgit2 0.21.2