summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/pages/ldap/omniauth_callbacks/index.js3
-rw-r--r--changelogs/unreleased/ldap-u2f-fix.yml5
2 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/javascripts/pages/ldap/omniauth_callbacks/index.js b/app/assets/javascripts/pages/ldap/omniauth_callbacks/index.js
new file mode 100644
index 00000000000..edd7e38471b
--- /dev/null
+++ b/app/assets/javascripts/pages/ldap/omniauth_callbacks/index.js
@@ -0,0 +1,3 @@
+import initU2F from '../../../shared/sessions/u2f';
+
+document.addEventListener('DOMContentLoaded', initU2F);
diff --git a/changelogs/unreleased/ldap-u2f-fix.yml b/changelogs/unreleased/ldap-u2f-fix.yml
new file mode 100644
index 00000000000..40b017f3d1b
--- /dev/null
+++ b/changelogs/unreleased/ldap-u2f-fix.yml
@@ -0,0 +1,5 @@
+---
+title: Fixed U2F login when used with LDAP
+merge_request:
+author:
+type: fixed