diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-08 18:49:30 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-05-08 18:49:30 +0300 |
| commit | 5955caed321e242bfebe52a4b47346a01a50e4f6 (patch) | |
| tree | d9710c0732ce21801b4a79a281bec0bd39582a95 /app/views/devise | |
| parent | f9e2b4730f58ba630344c9554eb907ab003abbd5 (diff) | |
| parent | 533593e95cd3a922a2ec2ea43b345862361dfd67 (diff) | |
Merge branch 'master' into bootstrap4
Diffstat (limited to 'app/views/devise')
| -rw-r--r-- | app/views/devise/mailer/unlock_instructions.html.haml | 2 | ||||
| -rw-r--r-- | app/views/devise/mailer/unlock_instructions.text.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/devise/mailer/unlock_instructions.html.haml b/app/views/devise/mailer/unlock_instructions.html.haml index 79e3a35cc9a..8ddfd3ea74a 100644 --- a/app/views/devise/mailer/unlock_instructions.html.haml +++ b/app/views/devise/mailer/unlock_instructions.html.haml @@ -2,7 +2,7 @@ = email_default_heading("Hello, #{@resource.name}!") %p Your GitLab account has been locked due to an excessive amount of unsuccessful - sign in attempts. Your account will automatically unlock in #{time_ago_in_words(Devise.unlock_in.from_now)} + sign in attempts. Your account will automatically unlock in #{distance_of_time_in_words(Devise.unlock_in)} or you may click the link below to unlock now. #cta = link_to('Unlock account', unlock_url(@resource, unlock_token: @token)) diff --git a/app/views/devise/mailer/unlock_instructions.text.erb b/app/views/devise/mailer/unlock_instructions.text.erb index 3aea3e20145..8d4abbf3500 100644 --- a/app/views/devise/mailer/unlock_instructions.text.erb +++ b/app/views/devise/mailer/unlock_instructions.text.erb @@ -1,7 +1,7 @@ Hello, <%= @resource.name %>! Your GitLab account has been locked due to an excessive amount of unsuccessful -sign in attempts. Your account will automatically unlock in <%= time_ago_in_words(Devise.unlock_in.from_now) %> +sign in attempts. Your account will automatically unlock in <%= distance_of_time_in_words(Devise.unlock_in) %> or you may click the link below to unlock now. <%= unlock_url(@resource, unlock_token: @token) %> |