diff options
| author | Takuya Noguchi <takninnovationresearch@gmail.com> | 2018-04-25 18:58:56 +0300 |
|---|---|---|
| committer | Takuya Noguchi <takninnovationresearch@gmail.com> | 2018-04-27 02:35:45 +0300 |
| commit | ebcd5711c5ff937bf925002bf9a5b636b037684e (patch) | |
| tree | af6ef8618e3e57dd3e03501e82647488c78a0ed1 /app/views/devise | |
| parent | c5f6c811eec6bca7952f84af9e30f3fafb848352 (diff) | |
Replace time_ago_in_words with JS-based one
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) %> |