diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-05-23 17:09:12 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-23 12:10:50 -0500 |
| commit | a10dca978161ee8effc532a6347f043b0a99af84 (patch) | |
| tree | dc32cf2c577500c709dfaeb56fd6fee42054c2a2 | |
| parent | 5144ba36d0763bd2d67436d397f7bbea7341e7bd (diff) | |
| download | gitlab-ce-a10dca978161ee8effc532a6347f043b0a99af84.tar.gz | |
Merge branch 'ldap-u2f-fix' into 'master'10-8-stable-patch-1
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 |