kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

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

Closes #35752

See merge request !13185
This commit is contained in:
Sean McGivern 2017-07-31 10:56:23 +00:00
parent 2f4491649d ebd2ed8f64
commit a628d39599
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changelogs/unreleased/dm-ldap-authentication-ssl-verification.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: Fix LDAP authentication to Git repository or container registry
merge_request:
author:

2
lib/gitlab/ldap/authentication.rb
View File

@ -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