summaryrefslogtreecommitdiff
path: root/app/views/devise
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2016-12-24 16:53:13 +0000
committerLuke "Jared" Bennett <lbennett@gitlab.com>2016-12-27 00:18:17 +0000
commitb285abeccc3c466b8501d1333f7391be5d6f4334 (patch)
treed0f62bb2ebb7d054b5505e09e4a7c64217f93f86 /app/views/devise
parent1e38f8ae7254fbe7e8608fd372a7bf3dd9e32607 (diff)
downloadgitlab-ce-b285abeccc3c466b8501d1333f7391be5d6f4334.tar.gz
Improved the u2f flow18556-polish-up-the-u2f-flow
Added tests
Diffstat (limited to 'app/views/devise')
-rw-r--r--app/views/devise/sessions/two_factor.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/devise/sessions/two_factor.html.haml b/app/views/devise/sessions/two_factor.html.haml
index 2cadc424668..951f03083bf 100644
--- a/app/views/devise/sessions/two_factor.html.haml
+++ b/app/views/devise/sessions/two_factor.html.haml
@@ -7,7 +7,7 @@
.login-box
.login-body
- if @user.two_factor_otp_enabled?
- = form_for(resource, as: resource_name, url: session_path(resource_name), method: :post, html: { class: 'edit_user gl-show-field-errors' }) do |f|
+ = form_for(resource, as: resource_name, url: session_path(resource_name), method: :post, html: { class: "edit_user gl-show-field-errors js-2fa-form #{'hidden' if @user.two_factor_u2f_enabled?}" }) do |f|
- resource_params = params[resource_name].presence || params
= f.hidden_field :remember_me, value: resource_params.fetch(:remember_me, 0)
%div