diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-03 15:14:04 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-03 15:14:04 +0000 |
| commit | 04a42ce3f1688dd262f72f654b62d840c7efac6e (patch) | |
| tree | 162e0fb0f302beab2920d542f2e158eb495a5191 /config | |
| parent | aaacef47fff4d7c359cb025caf879dff56a98932 (diff) | |
| parent | 81a5a9713d69c738912d27cb10e74577aa4f4978 (diff) | |
| download | gitlab-ce-04a42ce3f1688dd262f72f654b62d840c7efac6e.tar.gz | |
Merge branch 'custom-email-reply-to' into 'master'
Add ability to configure Reply-To address
### What does this MR do?
This MR adds configuration variable `email_reply_to` to make it possible to configure a custom Reply-To address other than the default `noreply@mydomain.com`.
### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?
#1305
See merge request !455
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 4c37fbf7cab..de79595d031 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 |