diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-03-14 10:49:11 -0600 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-03-14 10:49:11 -0600 |
| commit | ad0ca0499ac81c68e9e8011d2e194b16c759c1d6 (patch) | |
| tree | b3a39a2ef6cc4cfbdeab37fff87ed66dd4dcf9dc /config/gitlab.yml.example | |
| parent | 13e9f4f33420bf0bae0b61b98dd3c2301d6f6223 (diff) | |
| parent | 19e0dafbef47ca04f19d38b72b817beeb09e8510 (diff) | |
| download | gitlab-ce-ad0ca0499ac81c68e9e8011d2e194b16c759c1d6.tar.gz | |
Merge branch 'master' into fix-restricted-visibility
Conflicts:
db/schema.rb
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index dcd26c2317b..a85db10e019 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -43,6 +43,7 @@ production: &base # email_enabled: true # Email address used in the "From" field in mails sent by GitLab email_from: example@example.com + email_display_name: GitLab # Email server smtp settings are in config/initializers/smtp_settings.rb.sample |