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'
e03a2fa2 · Dmitriy Zaporozhets · c267d183 · 040b3be5 · e03a2fa2
Commit e03a2fa2 authored May 26, 2014 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

gitlab.yml.example config/gitlab.yml.example +2 -0

No files found.
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -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