diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-09-21 09:46:47 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-09-21 10:35:37 +0200 |
| commit | ee028d9d60522f8993a0b2429ac8a0631d59229a (patch) | |
| tree | 5e028593ff4394df287de8f61824c8d004a81688 /app/mailers | |
| parent | 11bbc06b4bbcb678f3ee6b8f1d143ed86d25a76c (diff) | |
| download | gitlab-ce-ee028d9d60522f8993a0b2429ac8a0631d59229a.tar.gz | |
Rename reply_by_email to incoming_email to prepare for the future.
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/notify.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index f196ffd53f3..db2f9654e14 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -110,7 +110,7 @@ class Notify < BaseMailer if reply_key headers['X-GitLab-Reply-Key'] = reply_key - address = Mail::Address.new(Gitlab::ReplyByEmail.reply_address(reply_key)) + address = Mail::Address.new(Gitlab::IncomingEmail.reply_address(reply_key)) address.display_name = @project.name_with_namespace headers['Reply-To'] = address @@ -150,6 +150,6 @@ class Notify < BaseMailer end def reply_key - @reply_key ||= Gitlab::ReplyByEmail.reply_key + @reply_key ||= SentNotification.reply_key end end |