diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-18 20:15:18 -0800 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-18 20:15:18 -0800 |
commit | 2fba31890e922fa8bae61e7aa3f21c5b4314e735 (patch) | |
tree | d5bc386180eab51660ef36a2b5c0debf95927a4f | |
parent | a5f5849340b4ad38da21fcada446ef3eb01872b5 (diff) | |
parent | a3ef61de9206f18f4d688ca7db2f1f888114abdb (diff) | |
download | gitlab-ce-2fba31890e922fa8bae61e7aa3f21c5b4314e735.tar.gz |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r-- | config/gitlab.yml.example | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 5d801b9ae5b..92f601282e0 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -44,7 +44,7 @@ production: &base # Email address used in the "From" field in mails sent by GitLab email_from: example@example.com - # Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample). + # Email server smtp settings are in config/initializers/smtp_settings.rb.sample ## User settings default_projects_limit: 10 |