diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-04-26 22:04:33 -0600 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2015-05-16 14:03:07 -0600 |
| commit | 0bfab084a811d7dad1f1929ee7b5c2bc59015173 (patch) | |
| tree | da3c6e696e22b3d9e377f956c1adbec4380a3e97 /app/views/notify | |
| parent | 35729671fb3a123ddeb7b2b1cda446fd661bd4e6 (diff) | |
| download | gitlab-ce-0bfab084a811d7dad1f1929ee7b5c2bc59015173.tar.gz | |
Explain reset token expiration in emails
Tell new users when their password reset token expires and provide a
link to get a new one.
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/new_user_email.html.haml | 2 | ||||
| -rw-r--r-- | app/views/notify/new_user_email.text.erb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/views/notify/new_user_email.html.haml b/app/views/notify/new_user_email.html.haml index ebbe98dd472..39cb01d4d29 100644 --- a/app/views/notify/new_user_email.html.haml +++ b/app/views/notify/new_user_email.html.haml @@ -12,3 +12,5 @@ - if @user.created_by_id %p = link_to "Click here to set your password", edit_password_url(@user, :reset_password_token => @token) + %p + = reset_token_expire_message diff --git a/app/views/notify/new_user_email.text.erb b/app/views/notify/new_user_email.text.erb index 96b26879a77..dd9b71e3b84 100644 --- a/app/views/notify/new_user_email.text.erb +++ b/app/views/notify/new_user_email.text.erb @@ -5,4 +5,6 @@ The Administrator created an account for you. Now you are a member of the compan login.................. <%= @user.email %> <% if @user.created_by_id %> <%= link_to "Click here to set your password", edit_password_url(@user, :reset_password_token => @token) %> + + <%= reset_token_expire_message %> <% end %> |