Merge branch 'ldap-u2f-fix' into 'master'

Fixed U2F authentication when used with LDAP Closes #46661 See merge request gitlab-org/gitlab-ce!19115

Merge branch 'ldap-u2f-fix' into 'master'
a10dca97 · Mike Greiling · Mayra Cabrera · 5144ba36 · a10dca97 · a10dca97
Commit a10dca97 authored May 23, 2018 by Mike Greiling Committed by Mayra Cabrera May 23, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

index.js ...assets/javascripts/pages/ldap/omniauth_callbacks/index.js +3 -0

ldap-u2f-fix.yml changelogs/unreleased/ldap-u2f-fix.yml +5 -0

No files found.
--- a/app/assets/javascripts/pages/ldap/omniauth_callbacks/index.js
+++ b/app/assets/javascripts/pages/ldap/omniauth_callbacks/index.js
+import initU2F from '../../../shared/sessions/u2f';
+
+document.addEventListener('DOMContentLoaded', initU2F);
--- a/changelogs/unreleased/ldap-u2f-fix.yml
+++ b/changelogs/unreleased/ldap-u2f-fix.yml
+---
+title: Fixed U2F login when used with LDAP
+merge_request:
+author:
+type: fixed