diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-31 10:56:23 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-31 10:56:23 +0000 |
| commit | a628d3959953357eeb3ebb8d3284fab1e7de68b2 (patch) | |
| tree | 1efec4855d49cdf8a2c3799fbd58258772a56650 | |
| parent | 2f4491649dfddd17cb9100f9023e142156d127de (diff) | |
| parent | ebd2ed8f644ba4f0fcaff979d4de41f773b31fdd (diff) | |
| download | gitlab-ce-a628d3959953357eeb3ebb8d3284fab1e7de68b2.tar.gz | |
Merge branch 'dm-ldap-authentication-ssl-verification' into 'master'
Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptor
Closes #35752
See merge request !13185
| -rw-r--r-- | changelogs/unreleased/dm-ldap-authentication-ssl-verification.yml | 4 | ||||
| -rw-r--r-- | lib/gitlab/ldap/authentication.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changelogs/unreleased/dm-ldap-authentication-ssl-verification.yml b/changelogs/unreleased/dm-ldap-authentication-ssl-verification.yml new file mode 100644 index 00000000000..59462a6666d --- /dev/null +++ b/changelogs/unreleased/dm-ldap-authentication-ssl-verification.yml @@ -0,0 +1,4 @@ +--- +title: Fix LDAP authentication to Git repository or container registry +merge_request: +author: diff --git a/lib/gitlab/ldap/authentication.rb b/lib/gitlab/ldap/authentication.rb index 4745311402c..ed1de73f8c6 100644 --- a/lib/gitlab/ldap/authentication.rb +++ b/lib/gitlab/ldap/authentication.rb @@ -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 |