Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-09 21:54:37 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-09 21:54:37 +0400
commit8700e91dab00478bf5f4eece5b96a2a55cae2157 (patch)
treeef2f120a997e54aeea060055260f468cb450c27b /app
parentc0f6a932b9277a49232348029198f3094276a84b (diff)
parentccf2e48a2c957eb420dc92e914be045c00d72a53 (diff)
Merge branch 'feature/no_reply' of /home/git/repositories/gitlab/gitlabhq
Diffstat (limited to 'app')
-rw-r--r--app/mailers/notify.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 2f7be00c33e..aec4c57cba8 100644
--- 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