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

Jacob Vosmaer
2 parents 22dad1ff 0ad4f1ba
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
@@ -142,7 +142,7 @@ default[&#39;gitlab&#39;][&#39;gitlab-rails&#39;][&#39;smtp_password&#39;] = nil
 default['gitlab']['gitlab-rails']['smtp_domain'] = nil
 default['gitlab']['gitlab-rails']['smtp_authentication'] = nil
 default['gitlab']['gitlab-rails']['smtp_enable_starttls_auto'] = nil
-default['gitlab']['gitlab-rails']['smtp_tls] = nil
+default['gitlab']['gitlab-rails']['smtp_tls'] = nil
  
 ####
 # Unicorn
...	...	@@ -142,7 +142,7 @@ default['gitlab']['gitlab-rails']['smtp_password'] = nil
142	142	default['gitlab']['gitlab-rails']['smtp_domain'] = nil
143	143	default['gitlab']['gitlab-rails']['smtp_authentication'] = nil
144	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	148	# Unicorn
...	...