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
This commit is contained in:
Dmitriy Zaporozhets
2014-05-26 18:35:49 +00:00
+2
View File
@@ -38,6 +38,8 @@ production: &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