diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-09-09 18:42:11 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-09-09 18:42:11 +0000 |
| commit | 516100c55b589e69198feca602a2f71e4e66e280 (patch) | |
| tree | 636e240a98511e980050d103815b4bc92b5bd0b8 /spec/javascripts | |
| parent | 2798353321d31092577d71b02ecf95b607e9d902 (diff) | |
| parent | 9224f031cfcb8283566f9d1dcc336ae644faf062 (diff) | |
| download | gitlab-ce-516100c55b589e69198feca602a2f71e4e66e280.tar.gz | |
Merge branch 'add-remember-option-u2f' into 'master'
Pass the remember_me option into the u2f form and support it while authenticating
## What does this MR do?
Adds remember me support in the u2f authentication, and makes sure the flag gets passed from the login form to the u2f form.
Based on the changes for the same thing done for regular 2fa: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4369
## Why was this MR needed?
The remember me option wasn't working for u2f devices (yubikey)
## What are the relevant issue numbers?
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18103
See merge request !5918
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/fixtures/u2f/authenticate.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/fixtures/u2f/authenticate.html.haml b/spec/javascripts/fixtures/u2f/authenticate.html.haml index 859e79a6c9e..779d6429a5f 100644 --- a/spec/javascripts/fixtures/u2f/authenticate.html.haml +++ b/spec/javascripts/fixtures/u2f/authenticate.html.haml @@ -1 +1 @@ -= render partial: "u2f/authenticate", locals: { new_user_session_path: "/users/sign_in" } += render partial: "u2f/authenticate", locals: { new_user_session_path: "/users/sign_in", params: {}, resource_name: "user" } |