From b4be7aed7711e51becb3be29ed82d6753cc73cc4 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Sun, 15 Feb 2015 01:28:50 +0100 Subject: Allow to configure smtp and sendmail in gitlab.yml --- app/mailers/devise_mailer.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/mailers/devise_mailer.rb') diff --git a/app/mailers/devise_mailer.rb b/app/mailers/devise_mailer.rb index b616add283a..e4b65c19b3f 100644 --- a/app/mailers/devise_mailer.rb +++ b/app/mailers/devise_mailer.rb @@ -1,4 +1,4 @@ class DeviseMailer < Devise::Mailer - default from: "#{Gitlab.config.gitlab.email_display_name} <#{Gitlab.config.gitlab.email_from}>" - default reply_to: Gitlab.config.gitlab.email_reply_to + default from: "#{Gitlab.config.outgoing_emails.display_name} <#{Gitlab.config.outgoing_emails.from}>" + default reply_to: Gitlab.config.outgoing_emails.reply_to end -- cgit v1.2.3