summaryrefslogtreecommitdiff
path: root/changelogs/unreleased
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-05-23 17:09:12 +0000
committerMayra Cabrera <mcabrera@gitlab.com>2018-05-23 12:10:50 -0500
commita10dca978161ee8effc532a6347f043b0a99af84 (patch)
treedc32cf2c577500c709dfaeb56fd6fee42054c2a2 /changelogs/unreleased
parent5144ba36d0763bd2d67436d397f7bbea7341e7bd (diff)
downloadgitlab-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
Diffstat (limited to 'changelogs/unreleased')
-rw-r--r--changelogs/unreleased/ldap-u2f-fix.yml5
1 files changed, 5 insertions, 0 deletions
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