diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-05-23 17:09:12 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-05-23 17:09:12 +0000 |
| commit | 332a16b623f789fdcfd09b1b78579c31ffbf2fbb (patch) | |
| tree | 385ce2dd0a4eeae809f5ec5cdd1ddd63db3e87ea | |
| parent | ddc760a0d625706196629c061f9dfa1cd2d8402e (diff) | |
| parent | 2303b08389279ac0a55765716a089299e9669bed (diff) | |
| download | gitlab-ce-332a16b623f789fdcfd09b1b78579c31ffbf2fbb.tar.gz | |
Merge branch 'ldap-u2f-fix' into 'master'
Fixed U2F authentication when used with LDAP
Closes #46661
See merge request gitlab-org/gitlab-ce!19115
| -rw-r--r-- | app/assets/javascripts/pages/ldap/omniauth_callbacks/index.js | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/ldap-u2f-fix.yml | 5 |
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 |