summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-05-23 17:09:12 +0000
committerMike Greiling <mike@pixelcog.com>2018-05-23 17:09:12 +0000
commit332a16b623f789fdcfd09b1b78579c31ffbf2fbb (patch)
tree385ce2dd0a4eeae809f5ec5cdd1ddd63db3e87ea /changelogs
parentddc760a0d625706196629c061f9dfa1cd2d8402e (diff)
parent2303b08389279ac0a55765716a089299e9669bed (diff)
downloadgitlab-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
Diffstat (limited to 'changelogs')
-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