Commit 2fc7c09c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'improve-email-text-part' into 'master'

Improve email text part

See merge request gitlab-org/gitlab-ce!29111
parents 96e2ff69 7fa10c47
No related merge requests found
......@@ -57,12 +57,6 @@ module EmailsHelper
pluralize(valid_length, unit)
end
def reset_token_expire_message
link_tag = link_to('request a new one', new_user_password_url(user_email: @user.email))
"This link is valid for #{password_reset_token_valid_time}. " \
"After it expires, you can #{link_tag}."
end
def header_logo
if current_appearance&.header_logo?
image_tag(
......
......@@ -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))}.
Hi <%= sanitize_name(@user.name) %>!
<% if Gitlab::CurrentSettings.allow_signup? %>
Your account has been created successfully.
<% else %>
The Administrator created an account for you. Now you are a member of the company GitLab application.
<% end %>
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 %>
---
title: Improve new user email markup unconsistency between text and html parts
merge_request: 29111
author: Haunui Saint-sevin
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment