[Git][noosfero/noosfero][stable-1.10] Merge branch 'noreply-emails' into 'master'

[Rodrigo Souto]

Rodrigo Souto pushed to branch stable-1.10 at Noosfero / noosfero


Commits:
cd84a996 by Rodrigo Souto at 2017-10-27T13:55:46+00:00
Merge branch 'noreply-emails' into 'master'

mailer: send e-mail from noreply_email instead of contact_email

See merge request noosfero/noosfero!1338

(cherry picked from commit 3137691cd601c93fc75b25e43d62c52c35104f4e)

f5fe9ea1 mailer: send e-mail from noreply_email instead of contact_email
- - - - -


1 changed file:

- app/mailers/user_mailer.rb


Changes:

=====================================
app/mailers/user_mailer.rb
=====================================
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -13,7 +13,7 @@ class UserMailer < ApplicationMailer
 
     mail(
       to: user_email,
-      from: "#{user.environment.name} <#{user.environment.contact_email}>".html_safe,
+      from: "#{user.environment.name} <#{user.environment.noreply_email}>".html_safe,
       subject: _("[%{environment}] Welcome to %{environment} mail!").html_safe % { :environment => user.environment.name }
     )
   end
@@ -28,7 +28,7 @@ class UserMailer < ApplicationMailer
     @join = (user.community_to_join if user.community_to_join)
 
     mail_with_template(
-      from: "#{user.environment.name} <#{user.environment.contact_email}>",
+      from: "#{user.environment.name} <#{user.environment.noreply_email}>",
       to: user.email,
       subject: _("[%s] Activate your account").html_safe % [user.environment.name],
       template_params: {:environment => user.environment, :activation_code => @activation_code, :redirection => @redirection, :join => @join, :person => user.person, :url => @url},
@@ -44,7 +44,7 @@ class UserMailer < ApplicationMailer
     mail(
       content_type: 'text/html',
       to: user.email,
-      from: "#{user.environment.name} <#{user.environment.contact_email}>".html_safe,
+      from: "#{user.environment.name} <#{user.environment.noreply_email}>".html_safe,
       subject: email_subject.blank? ? _("Welcome to environment %s").html_safe % [user.environment.name] : email_subject,
       body: @body
     )
@@ -63,7 +63,7 @@ class UserMailer < ApplicationMailer
     mail(
       content_type: 'text/html',
       to: user.email,
-      from: "#{user.environment.name} <#{user.environment.contact_email}>".html_safe,
+      from: "#{user.environment.name} <#{user.environment.noreply_email}>".html_safe,
       subject: _("[%s] What about grow up your network?").html_safe % user.environment.name
     )
   end



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/cd84a996e396992676d16a0523804ac15add151b

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/cd84a996e396992676d16a0523804ac15add151b
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20171027/6036ca5a/attachment-0001.html>