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/helpers | |
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/helpers')
-rw-r--r-- | app/helpers/emails_helper.rb | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/app/helpers/emails_helper.rb b/app/helpers/emails_helper.rb index 0df3ecc90b7..12aa561a14e 100644 --- a/app/helpers/emails_helper.rb +++ b/app/helpers/emails_helper.rb @@ -35,4 +35,23 @@ module EmailsHelper lexer = Rugments::Lexers::Diff.new raw formatter.format(lexer.lex(diffcontent)) end + + def password_reset_token_valid_time + valid_hours = Devise.reset_password_within / 60 / 60 + if valid_hours >= 24 + unit = 'day' + valid_length = (valid_hours / 24).floor + else + unit = 'hour' + valid_length = valid_hours.floor + end + + pluralize(valid_length, unit) + end + + def reset_token_expire_message + link_tag = link_to('request a new one', new_user_password_url) + msg = "This link is valid for #{password_reset_token_valid_time}. " + msg << "After it expires, you can #{link_tag}." + end end |