diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/views/u2f | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/views/u2f')
-rw-r--r-- | app/views/u2f/_authenticate.html.haml | 19 | ||||
-rw-r--r-- | app/views/u2f/_register.html.haml | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/app/views/u2f/_authenticate.html.haml b/app/views/u2f/_authenticate.html.haml index 51018428b1b..6658d70df8d 100644 --- a/app/views/u2f/_authenticate.html.haml +++ b/app/views/u2f/_authenticate.html.haml @@ -1,18 +1,19 @@ -#js-authenticate-u2f +#js-authenticate-token-2fa %a.btn.btn-block.btn-info#js-login-2fa-device{ href: '#' }= _("Sign in via 2FA code") -%script#js-authenticate-u2f-in-progress{ type: "text/template" } +%script#js-authenticate-token-2fa-in-progress{ type: "text/template" } %p= _("Trying to communicate with your device. Plug it in (if you haven't already) and press the button on the device now.") -%script#js-authenticate-u2f-error{ type: "text/template" } +%script#js-authenticate-token-2fa-error{ type: "text/template" } %div %p <%= error_message %> (#{_("error code:")} <%= error_code %>) - %a.btn.btn-block.btn-warning#js-u2f-try-again= _("Try again?") + %a.btn.btn-block.btn-warning#js-token-2fa-try-again= _("Try again?") -%script#js-authenticate-u2f-authenticated{ type: "text/template" } +%script#js-authenticate-token-2fa-authenticated{ type: "text/template" } %div - %p= _("We heard back from your U2F device. You have been authenticated.") - = form_tag(new_user_session_path, method: :post, id: 'js-login-u2f-form') do |f| - - resource_params = params[resource_name].presence || params - = hidden_field_tag 'user[remember_me]', resource_params.fetch(:remember_me, 0) + %p= _("We heard back from your device. You have been authenticated.") + = form_tag(target_path, method: :post, id: 'js-login-token-2fa-form') do |f| + - if render_remember_me + - resource_params = params[resource_name].presence || params + = hidden_field_tag 'user[remember_me]', resource_params.fetch(:remember_me, 0) = hidden_field_tag 'user[device_response]', nil, class: 'form-control', required: true, id: "js-device-response" diff --git a/app/views/u2f/_register.html.haml b/app/views/u2f/_register.html.haml index ef3835332a7..6f3f4c4981c 100644 --- a/app/views/u2f/_register.html.haml +++ b/app/views/u2f/_register.html.haml @@ -25,7 +25,7 @@ %div %p %span <%= error_message %> (#{_("error code:")} <%= error_code %>) - %a.btn.btn-warning#js-u2f-try-again= _("Try again?") + %a.btn.btn-warning#js-token-2fa-try-again= _("Try again?") %script#js-register-u2f-registered{ type: "text/template" } .row.append-bottom-10 |