Merge branch 'master' of github.com:gitlabhq/gitlabhq

3 files changed, 7 insertions, 7 deletions

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
diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index 9cb7077e59d..c6bc716930d 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -129,7 +129,7 @@ module Emails
         if send_from_committer_email && can_send_from_user_email?(@author)
           @author.email
         else
-          Gitlab.config.gitlab.email_reply_to
+          Gitlab.config.outgoing_emails.reply_to
         end
 
       mail(from:      sender(author_id, send_from_committer_email),
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 79fb48b00d3..a9800f7f103 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -17,7 +17,7 @@ class Notify < ActionMailer::Base
   helper_method :current_user, :can?
 
   default from: Proc.new { default_sender_address.format }
-  default reply_to: Gitlab.config.gitlab.email_reply_to
+  default reply_to: Gitlab.config.outgoing_emails.reply_to
 
   # Just send email with 2 seconds delay
   def self.delay
@@ -50,9 +50,9 @@ class Notify < ActionMailer::Base
 
   # The default email address to send emails from
   def default_sender_address
-    address = Mail::Address.new(Gitlab.config.gitlab.email_from)
-    address.display_name = Gitlab.config.gitlab.email_display_name
-    address
+    Mail::Address.new(Gitlab.config.outgoing_emails.from).tap do |address|
+      address.display_name = Gitlab.config.outgoing_emails.display_name
+    end
   end
 
   def can_send_from_user_email?(sender)