summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
diff options
context:
space:
mode:
authorDJ Mountney <david@twkie.net>2016-08-19 18:51:56 -0700
committerDJ Mountney <david@twkie.net>2016-09-01 17:11:42 -0700
commit9224f031cfcb8283566f9d1dcc336ae644faf062 (patch)
tree4c2012f873b24bd30b6fdea0807cae6d3fe43f4e /app/controllers/concerns
parent33a367e828c95ba7321d33361be67c68b1603bdd (diff)
downloadgitlab-ce-9224f031cfcb8283566f9d1dcc336ae644faf062.tar.gz
Pass the remember_me option into the u2f form and support it while authenticatingadd-remember-option-u2f
Matches the changes done for non-u2f two-factor auth
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r--app/controllers/concerns/authenticates_with_two_factor.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/concerns/authenticates_with_two_factor.rb b/app/controllers/concerns/authenticates_with_two_factor.rb
index ba07cea569c..d5a8a962662 100644
--- a/app/controllers/concerns/authenticates_with_two_factor.rb
+++ b/app/controllers/concerns/authenticates_with_two_factor.rb
@@ -62,6 +62,7 @@ module AuthenticatesWithTwoFactor
session.delete(:otp_user_id)
session.delete(:challenges)
+ remember_me(user) if user_params[:remember_me] == '1'
sign_in(user)
else
flash.now[:alert] = 'Authentication via U2F device failed.'