diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-06-07 10:15:03 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-06-07 10:15:03 +0000 |
commit | 2fc7c09cb7675db6d8319cce6f1aab857b37222f (patch) | |
tree | 453ee38b50ce7f173744189d38c7044f8dc5c112 /app/helpers | |
parent | 96e2ff69acb31028865b4582758bf1dab51c4332 (diff) | |
parent | 7fa10c47ec6886855bb187ad7ff17c7c6ff68231 (diff) | |
download | gitlab-ce-2fc7c09cb7675db6d8319cce6f1aab857b37222f.tar.gz |
Merge branch 'improve-email-text-part' into 'master'
Improve email text part
See merge request gitlab-org/gitlab-ce!29111
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/emails_helper.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/helpers/emails_helper.rb b/app/helpers/emails_helper.rb index 2beb081ab77..36122d3a22a 100644 --- a/app/helpers/emails_helper.rb +++ b/app/helpers/emails_helper.rb @@ -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( |