diff options
| author | Haunui Saint-sevin <haunui.ss@gmail.com> | 2019-06-04 00:49:20 +0000 |
|---|---|---|
| committer | Haunui Saint-sevin <haunui.ss@gmail.com> | 2019-06-04 21:18:11 +0000 |
| commit | 3de4d313a353e2133da5adc9140ce939e76eed94 (patch) | |
| tree | f9667f12041a43495d9887c16ecbd4d37d134617 /app/views/notify | |
| parent | e5a74e0b7e2b8b2e82c5267bda45e4e96fca2346 (diff) | |
| download | gitlab-ce-3de4d313a353e2133da5adc9140ce939e76eed94.tar.gz | |
Remove html tag from the text part of email
Instead of calling single function emitting HTML tags in the HTML part
of email, directly output HTML tags or raw text.
Diffstat (limited to 'app/views/notify')
| -rw-r--r-- | app/views/notify/new_user_email.html.haml | 3 | ||||
| -rw-r--r-- | app/views/notify/new_user_email.text.erb | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/views/notify/new_user_email.html.haml b/app/views/notify/new_user_email.html.haml index dfbb5c75bd3..ec135ae994f 100644 --- a/app/views/notify/new_user_email.html.haml +++ b/app/views/notify/new_user_email.html.haml @@ -13,4 +13,5 @@ %p = link_to "Click here to set your password", edit_password_url(@user, reset_password_token: @token) %p - = raw reset_token_expire_message + This link is valid for #{password_reset_token_valid_time}. + After it expires, you can #{link_to("request a new one", new_user_password_url(user_email: @user.email))}. diff --git a/app/views/notify/new_user_email.text.erb b/app/views/notify/new_user_email.text.erb index f3f20f3bfba..d5aba21b8b7 100644 --- a/app/views/notify/new_user_email.text.erb +++ b/app/views/notify/new_user_email.text.erb @@ -4,7 +4,9 @@ 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) %> +Click here to set your password: +<%= edit_password_url(@user, :reset_password_token => @token) %> - <%= reset_token_expire_message %> +This link is valid for <%= password_reset_token_valid_time %>. After it expires, you can request a new one here: +<%= new_user_password_url(user_email: @user.email) %> <% end %> |