Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Mountney <david@twkie.net>2016-08-20 04:51:56 +0300
committerDJ Mountney <david@twkie.net>2016-09-02 03:11:42 +0300
commit9224f031cfcb8283566f9d1dcc336ae644faf062 (patch)
tree4c2012f873b24bd30b6fdea0807cae6d3fe43f4e /app/views/devise
parent33a367e828c95ba7321d33361be67c68b1603bdd (diff)
Pass the remember_me option into the u2f form and support it while authenticating
Matches the changes done for non-u2f two-factor auth
Diffstat (limited to 'app/views/devise')
-rw-r--r--app/views/devise/sessions/two_factor.html.haml3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/devise/sessions/two_factor.html.haml b/app/views/devise/sessions/two_factor.html.haml
index 4debd3d608f..e623f7cff88 100644
--- a/app/views/devise/sessions/two_factor.html.haml
+++ b/app/views/devise/sessions/two_factor.html.haml
@@ -18,6 +18,5 @@
= f.submit "Verify code", class: "btn btn-save"
- if @user.two_factor_u2f_enabled?
-
%hr
- = render "u2f/authenticate"
+ = render "u2f/authenticate", locals: { params: params, resource: resource, resource_name: resource_name }