Merge branch 'add-custom-reply-to-config' into 'master'

Add custom Reply-To address to omnibus config

Updated to reflect new `email_reply_to` field:

81a5a9713d

See merge request !316

CHANGELOG.md

@@ -9,6 +9,7 @@ omnibus-gitlab repository.
 
 7.9.0
 
+- Add gitlab_email_reply_to property (Stan Hu) e04fe3e8227d0356add3095a0cd56955d7acfe60
 - Restart nginx instead of issuing a HUP signal changes so that changes in listen_address work (Stan Hu) 428ee157c346f3f0eae53762b51145502b1456a6
 - Respect gitlab_email_enabled property (Daniel Serodio) e2982692d49772c4f896a775e476a62b4831b8a1
 - Use correct cert for CI (Flávio J. Saraiva) 484227e2dfe33f59e3683a5757be6842d7ce79d2

doc/settings/smtp.md

@@ -18,6 +18,7 @@ gitlab_rails['smtp_openssl_verify_mode'] = 'peer'
 # If your SMTP server does not like the default 'From: gitlab@localhost' you
 # can change the 'From' with this setting.
 gitlab_rails['gitlab_email_from'] = 'gitlab@example.com'
+gitlab_rails['gitlab_email_reply_to'] = 'noreply@example.com'
 ```
 
 ## GitLab CI
@@ -39,6 +40,7 @@ gitlab_ci['smtp_address'] = "smtp.server"
 
 ```
 gitlab_rails['gitlab_email_from'] = 'my.email@gmail.com'
+gitlab_rails['gitlab_email_reply_to'] = 'my.email@gmail.com'
 
 gitlab_rails['smtp_enable'] = true
 gitlab_rails['smtp_address'] = "smtp.gmail.com"

files/gitlab-config-template/gitlab.rb.template

@@ -15,6 +15,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitlab_rails['gitlab_email_enabled'] = true
 # gitlab_rails['gitlab_email_from'] = 'example@example.com'
 # gitlab_rails['gitlab_email_display_name'] = 'Example'
+# gitlab_rails['gitlab_email_reply_to'] = 'noreply@example.com'
 # gitlab_rails['gitlab_default_can_create_group'] = true
 # gitlab_rails['gitlab_username_changing_enabled'] = true
 # gitlab_rails['gitlab_default_theme'] = 2

files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb

@@ -35,6 +35,7 @@ production: &base
     # Email address used in the "From" field in mails sent by GitLab
     email_from: <%= @gitlab_email_from %>
     email_display_name: <%= @gitlab_email_display_name %>
+    email_reply_to: <%= @gitlab_email_reply_to %>
 
     # Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample).