Merge branch 'emailsonpush-replyto' into 'master'

Set EmailsOnPush reply-to address to committer email when enabled.

Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2227.

See merge request !520

1 files changed, 11 insertions, 3 deletions

diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index 2584e9d48b1..0dbb2939bb3 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -125,9 +125,17 @@ module Emails
 
       @disable_footer = true
 
-      mail(from: sender(author_id, send_from_committer_email),
-           to: recipient,
-           subject: @subject)
+      reply_to = 
+        if send_from_committer_email && can_send_from_user_email?(@author)
+          @author.email
+        else
+          Gitlab.config.gitlab.email_reply_to
+        end
+
+      mail(from:      sender(author_id, send_from_committer_email),
+           reply_to:  reply_to,
+           to:        recipient,
+           subject:   @subject)
     end
   end
 end