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

Dmitriy Zaporozhets
2 parents c0f6a932 ccf2e48a
Showing 1 changed file with 1 additions and 0 deletions Show diff stats
app/mailers/notify.rb
@@ -16,6 +16,7 @@ class Notify &lt; 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
...	...	@@ -16,6 +16,7 @@ class Notify < ActionMailer::Base
16	16	default_url_options[:script_name] = Gitlab.config.gitlab.relative_url_root
17	17
18	18	default from: Gitlab.config.gitlab.email_from
	19	+ default reply_to: "noreply@#{Gitlab.config.gitlab.host}"
19	20
20	21	# Just send email with 3 seconds delay
21	22	def self.delay
...	...