summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2019-01-30 09:57:13 +0000
committerDouwe Maan <douwe@gitlab.com>2019-01-30 09:57:13 +0000
commit4dd8740c8afc7039a15237358474b689b6a12308 (patch)
tree54ec3d37e7ec9cbe95015ab9a9f3111377df0ba4 /changelogs
parent559364ee67cedadb98c450ba31c2511780f84d57 (diff)
parentab4aba7065b52281fcd1224e1e883fe35128751c (diff)
downloadgitlab-ce-4dd8740c8afc7039a15237358474b689b6a12308.tar.gz
Merge branch 'sh-disable-nil-user-id-identity-validation' into 'master'
Fix failed LDAP logins when nil user_id present Closes #56734 See merge request gitlab-org/gitlab-ce!24749
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/sh-disable-nil-user-id-identity-validation.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-disable-nil-user-id-identity-validation.yml b/changelogs/unreleased/sh-disable-nil-user-id-identity-validation.yml
new file mode 100644
index 00000000000..5af3bdce51b
--- /dev/null
+++ b/changelogs/unreleased/sh-disable-nil-user-id-identity-validation.yml
@@ -0,0 +1,5 @@
+---
+title: Fix failed LDAP logins when nil user_id present
+merge_request: 24749
+author:
+type: fixed