Download as
Browse Code »

Commit dcb3809cc33f1917b89663745344be9a41c7416e

Authored by Jacob Vosmaer
2 parents 22dad1ff 0ad4f1ba
Exists in 7-1-stable-ee

Merge branch '7-1-stable' of gitlab.com:gitlab-org/omnibus-gitlab into 7-1-stable-ee

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @dcb3809
@@ -142,7 +142,7 @@ default['gitlab']['gitlab-rails']['smtp_password'] = nil @@ -142,7 +142,7 @@ default['gitlab']['gitlab-rails']['smtp_password'] = nil
142 default['gitlab']['gitlab-rails']['smtp_domain'] = nil 142 default['gitlab']['gitlab-rails']['smtp_domain'] = nil
143 default['gitlab']['gitlab-rails']['smtp_authentication'] = nil 143 default['gitlab']['gitlab-rails']['smtp_authentication'] = nil
144 default['gitlab']['gitlab-rails']['smtp_enable_starttls_auto'] = nil 144 default['gitlab']['gitlab-rails']['smtp_enable_starttls_auto'] = nil
145 -default['gitlab']['gitlab-rails']['smtp_tls] = nil 145 +default['gitlab']['gitlab-rails']['smtp_tls'] = nil
146 146
147 #### 147 ####
148 # Unicorn 148 # Unicorn