diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-15 22:17:48 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-15 22:17:48 -0600 |
| commit | 89a9d629f776a3a115c1e89ee4c13e8cbe7ae684 (patch) | |
| tree | c5da0f86e23fbd544dea6bcef124c41803c841ef /app/views/user_mailer/email_changed.en.html.erb | |
| parent | 0c7dc6c78123728a9a0a32e16c2ad524e76926c8 (diff) | |
| parent | 5276c0a0900a0886b59a8ead2346540aa381ea46 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: Gemfile.lock
Diffstat (limited to 'app/views/user_mailer/email_changed.en.html.erb')
| -rw-r--r-- | app/views/user_mailer/email_changed.en.html.erb | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/app/views/user_mailer/email_changed.en.html.erb b/app/views/user_mailer/email_changed.en.html.erb deleted file mode 100644 index c10680086..000000000 --- a/app/views/user_mailer/email_changed.en.html.erb +++ /dev/null @@ -1,15 +0,0 @@ -<p>Hello <%= @resource.email %>!</p> - -<% if @resource&.unconfirmed_email? %> - <p>We're contacting you to notify you that the email you use on <%= @instance %> is being changed to <%= @resource.unconfirmed_email %>.</p> -<% else %> - <p>We're contacting you to notify you that the email you use on <%= @instance %> has been changed to <%= @resource.email %>.</p> -<% end %> - -<p> - If you did not change your email, it is likely that someone has gained access to your account. Please change your password immediately or contact the instance admin if you're locked out of your account. -</p> - -<p>Sincerely,<p> - -<p>The <%= @instance %> team</p> |