diff options
author | Robert Speicher <robert@gitlab.com> | 2016-06-09 18:43:22 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-06-09 18:43:22 +0000 |
commit | 8138f340f81d5144290893a7fc6897d9a502bbdb (patch) | |
tree | b991ded0977012d3ee0b661b2fc3f77337e4307d /lib/api/files.rb | |
parent | 95de1c1a6a2beca8282ee715470206ebbfdcfa0c (diff) | |
parent | 9f554aadd585e357c77a22733c82f381967cac1d (diff) | |
download | gitlab-ce-8138f340f81d5144290893a7fc6897d9a502bbdb.tar.gz |
Merge branch 'rs-fix-ldap-2fa-login' into 'master'
Fix 2FA-based login for LDAP users
The OTP input form is shared by both LDAP and standard logins, but when
coming from an LDAP-based form, the form parameters aren't nested in a
Hash based on the `resource_name` value.
Now we check for a nested `remember_me` parameter and use that if it
exists, or fall back to the non-nested parameters if it doesn't.
Somewhat confusingly, the OTP input form _does_ nest parameters under
the `resource_name`, regardless of what type of login we're coming from,
so that allows everything else to work as normal.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18185
See merge request !4493
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions