diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-19 20:17:18 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-19 20:17:18 +0000 |
| commit | df70571bfe8aa18cfb44661fb02cc1e2e256c4e8 (patch) | |
| tree | cf6269fa490b4533999d68acb969a1a86447666b /app/views/user_mailer/email_changed.text.erb | |
| parent | ab04be2f84132e6b6a83ca86cbabf2cdf13f5894 (diff) | |
| parent | ff6b8a6443c2c97d185927053bdc8816e0e03434 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/views/user_mailer/email_changed.text.erb')
| -rw-r--r-- | app/views/user_mailer/email_changed.text.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/user_mailer/email_changed.text.erb b/app/views/user_mailer/email_changed.text.erb index 2b58415f5..345b16a2c 100644 --- a/app/views/user_mailer/email_changed.text.erb +++ b/app/views/user_mailer/email_changed.text.erb @@ -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' %> |