diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-03-25 20:17:24 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-04-03 06:47:54 -0700 |
| commit | 81a5a9713d69c738912d27cb10e74577aa4f4978 (patch) | |
| tree | 4a2379fbf18354765504595bf5c783c623f1cce8 /config | |
| parent | 2a0d38c03fa20979a92597fdff18989c2b8e106b (diff) | |
| download | gitlab-ce-81a5a9713d69c738912d27cb10e74577aa4f4978.tar.gz | |
Add ability to configure Reply-To address in gitlab.yml
Closes #1305
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 1 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 760a589d6e2..3d91b67e748 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -49,6 +49,7 @@ production: &base # Email address used in the "From" field in mails sent by GitLab email_from: example@example.com email_display_name: GitLab + email_reply_to: noreply@example.com # Email server smtp settings are in config/initializers/smtp_settings.rb.sample diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 15c1ae9466f..fb2dddf2c99 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -103,6 +103,7 @@ Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http" Settings.gitlab['email_enabled'] ||= true if Settings.gitlab['email_enabled'].nil? Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}" Settings.gitlab['email_display_name'] ||= "GitLab" +Settings.gitlab['email_reply_to'] ||= "noreply@#{Settings.gitlab.host}" Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url) Settings.gitlab['user'] ||= 'git' Settings.gitlab['user_home'] ||= begin |