Merge branch 'email-hint' into 'master'

Email hint After this is merged decline http://feedback.gitlab.com/forums/176466-general/suggestions/5767472-move-actionmailer-sending-method-and-smpt-settings

Merge branch 'email-hint' into 'master'
Email hint After this is merged decline http://feedback.gitlab.com/forums/176466-general/suggestions/5767472-move-actionmailer-sending-method-and-smpt-settings
Dmitriy Zaporozhets
2 parents c267d183 040b3be5
Showing 1 changed file with 2 additions and 0 deletions Show diff stats
config/gitlab.yml.example
@@ -38,6 +38,8 @@ production: &amp;base
     # Email address of your support contact (default: same as email_from)
     support_email: support@example.com
  
+    # Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample).
+
     ## User settings
     default_projects_limit: 10
     # default_can_create_group: false  # default: true
...	...	@@ -38,6 +38,8 @@ production: &base
38	38	# Email address of your support contact (default: same as email_from)
39	39	support_email: support@example.com
40	40
	41	+ # Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample).
	42	+
41	43	## User settings
42	44	default_projects_limit: 10
43	45	# default_can_create_group: false # default: true
...	...