diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-07-31 11:42:50 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-07-31 11:43:35 +0200 |
| commit | ebd2ed8f644ba4f0fcaff979d4de41f773b31fdd (patch) | |
| tree | 2f4170bb3ab10addf1206cad9db902f0e254ee26 | |
| parent | 6fe736f2c927340ed8cf827080db781f7c8adcdf (diff) | |
| download | gitlab-ce-ebd2ed8f644ba4f0fcaff979d4de41f773b31fdd.tar.gz | |
Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptordm-ldap-authentication-ssl-verification
| -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 |