Merge branch 'master' into signature-sheets

config/initializers/devise.rb

@@ -12,7 +12,11 @@ Devise.setup do |config|
   # 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 = 'noreply@consul.es'
+  if Rails.env.test?
+    config.mailer_sender = "noreply@example.org"
+  else
+    config.mailer_sender = "#{Setting['mailer_from_name']} <#{Setting['mailer_from_address']}>"
+  end
 
   # Configure the class responsible to send e-mails.
   config.mailer = 'DeviseMailer'