Merge branch 'feature/no_reply' of /home/git/repositories/gitlab/gitlabhq

8700e91d · Dmitriy Zaporozhets · c0f6a932 · ccf2e48a · 8700e91d
Commit 8700e91d authored Dec 09, 2013 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

app/mailers/notify.rb app/mailers/notify.rb +1 -0

No files found.
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -16,6 +16,7 @@ class Notify < ActionMailer::Base
  default_url_options[:script_name] = Gitlab.config.gitlab.relative_url_root

  default from: Gitlab.config.gitlab.email_from
+  default reply_to: "noreply@#{Gitlab.config.gitlab.host}"

  # Just send email with 3 seconds delay
  def self.delay