queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix e-mail changed notification (fixes #6778) (#6835)

Browse source 
In Devise::Mailer#email_changed, the new email might be in the email attr.
See: https://github.com/plataformatec/devise/blob/master/app/views/devise/mailer/email_changed.html.erb
This commit is contained in:
ThibG 2018-03-19 20:07:47 +01:00 committed by Eugen Rochko
parent f7c46fc113
commit 357f9298bd
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/user_mailer/email_changed.html.haml
View file

@ -38,7 +38,7 @@
%table.input{ align: 'center', cellspacing: 0, cellpadding: 0 }
%tbody
%tr
%td= @resource.unconfirmed_email
%td= @resource.try(:unconfirmed_email) ? @resource.unconfirmed_email : @resource.email
%table.email-table{ cellspacing: 0, cellpadding: 0 }
%tbody

2
app/views/user_mailer/email_changed.text.erb
View file

@ -4,6 +4,6 @@
<%= t 'devise.mailer.email_changed.explanation' %>
<%= @resource.unconfirmed_email %>
<%= @resource.try(:unconfirmed_email) ? @resource.unconfirmed_email : @resource.email %>
<%= t 'devise.mailer.email_changed.extra' %>