Merge branch 'make-reply-to-work-everywhere' into 'master'

Make Reply-To config apply to change e-mail confirmation and other notifications sent through Devise

Notifications sent through Devise were using the default From: address, and due to a broken test line nothing was actually being run.

The only way to customize the Devise Reply-To field is to use a custom mailer. Moved the e-mail configuration out of the initializers to accommodate this.

Closes #1556

See merge request !596

CHANGELOG

 Please view this file on the master branch, on stable branches it's out of date.
 
 v 7.11.0 (unreleased)
+  - Make Reply-To config apply to change e-mail confirmation and other Devise notifications (Stan Hu)
   - Don't allow a merge request to be merged when its title starts with "WIP".
   - Add a page title to every page.
   - Get Gitorious importer to work again.

app/mailers/devise_mailer.rb

+class DeviseMailer < Devise::Mailer
+  default from: "GitLab <#{Gitlab.config.gitlab.email_from}>"
+  default reply_to: Gitlab.config.gitlab.email_reply_to
+end

config/initializers/devise.rb

@@ -2,13 +2,8 @@
 # four configuration values can also be set straight in your models.
 Devise.setup do |config|
   # ==> Mailer Configuration
-  # Configure the e-mail address which will be shown in Devise::Mailer,
-  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
-  config.mailer_sender = "GitLab <#{Gitlab.config.gitlab.email_from}>"
-
-
   # Configure the class responsible to send e-mails.
-  # config.mailer = "Devise::Mailer"
+  config.mailer = "DeviseMailer"
 
   # ==> ORM configuration
   # Load and configure the ORM. Supports :active_record (default) and

spec/mailers/notify_spec.rb

@@ -11,9 +11,8 @@ describe Notify do
   let(:recipient) { create(:user, email: 'recipient@example.com') }
   let(:project) { create(:project) }
 
-  around(:each) { ActionMailer::Base.deliveries.clear }
-
   before(:each) do
+    ActionMailer::Base.deliveries.clear
     email = recipient.emails.create(email: "notifications@example.com")
     recipient.update_attribute(:notification_email, email.email)
   end