diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-04-15 17:07:49 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-04-15 17:07:49 +0200 |
commit | 66ad30db489ddb2b3ecc98d284aabd47c9d4ae84 (patch) | |
tree | d8f035139c20e59c39bb35a74686783094c297da /app/views/user_mailer | |
parent | 615073df33b9a4317ac5c93fdef83c9cd34567fa (diff) | |
parent | 5524258da9bc1d62b1396d19c672d3a8335ffbc5 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `package.json`: No real conflict, upstream updated a dependency which is textually adjacent to a glitch-soc-specific dependency. Updated it. - `yarn.lock`: No real conflict, upstream updated a dependency which is textually adjacent to a glitch-soc-specific dependency. Updated it.
Diffstat (limited to 'app/views/user_mailer')
-rw-r--r-- | app/views/user_mailer/email_changed.html.haml | 2 | ||||
-rw-r--r-- | app/views/user_mailer/email_changed.text.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/user_mailer/email_changed.html.haml b/app/views/user_mailer/email_changed.html.haml index 7e91e87ad..96be8624d 100644 --- a/app/views/user_mailer/email_changed.html.haml +++ b/app/views/user_mailer/email_changed.html.haml @@ -38,7 +38,7 @@ %table.input{ align: 'center', cellspacing: 0, cellpadding: 0 } %tbody %tr - %td= @resource.try(:unconfirmed_email) ? @resource.unconfirmed_email : @resource.email + %td= @resource.unconfirmed_email %table.email-table{ cellspacing: 0, cellpadding: 0 } %tbody diff --git a/app/views/user_mailer/email_changed.text.erb b/app/views/user_mailer/email_changed.text.erb index 345b16a2c..2b58415f5 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.try(:unconfirmed_email) ? @resource.unconfirmed_email : @resource.email %> +<%= @resource.unconfirmed_email %> <%= t 'devise.mailer.email_changed.extra' %> |