Commit a628d395 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'dm-ldap-authentication-ssl-verification' into 'master'

Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptor

Closes #35752

See merge request !13185
parents 2f449164 ebd2ed8f
---
title: Fix LDAP authentication to Git repository or container registry
merge_request:
author:
......@@ -42,7 +42,7 @@ module Gitlab
end
def adapter
OmniAuth::LDAP::Adaptor.new(config.options.symbolize_keys)
OmniAuth::LDAP::Adaptor.new(config.omniauth_options)
end
def config
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment