diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-16 21:10:18 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-16 21:10:18 +0200 |
commit | 687cf48e60ede21c75dd53ca39b8560031469015 (patch) | |
tree | 252fb073a9896ebab909339b97b0347fd73ff14e /app/views/devise/mailer | |
parent | 84f96137753143ee597a3c15fff93239f835df61 (diff) | |
download | gitlab-ce-687cf48e60ede21c75dd53ca39b8560031469015.tar.gz |
Improve email with confirmation instructions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/devise/mailer')
-rw-r--r-- | app/views/devise/mailer/confirmation_instructions.html.erb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb index 7b4fd526964..553d08369e9 100644 --- a/app/views/devise/mailer/confirmation_instructions.html.erb +++ b/app/views/devise/mailer/confirmation_instructions.html.erb @@ -1,5 +1,9 @@ -<p>Welcome <%= @resource.email %>!</p> +<p>Welcome <%= @resource.name %>!</p> -<p>You can confirm your account through the link below:</p> +<% if @resource.unconfirmed_email.present? %> + <p>You can confirm your email (<%= @resource.unconfirmed_email %>) through the link below:</p> +<% else %> + <p>You can confirm your account through the link below:</p> +<% end %> <p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @resource.confirmation_token) %></p> |