diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-26 22:35:49 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-26 22:35:49 +0400 |
| commit | e03a2fa2d145a3e185c8ec9b66f2a1b59fa6fae1 (patch) | |
| tree | c970203e6e28f99260deeeaa313a7863640b8757 | |
| parent | c267d183ba81be807cabe9b172f5f3e02943cbd1 (diff) | |
| parent | 040b3be5b1e1a0212c4c0073dfb252c26adbfc7d (diff) | |
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
| -rw-r--r-- | config/gitlab.yml.example | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 7b53a065533..04e85ed9a9d 100644 --- 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 |