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

2017-07-31 11:42:50 +02:00 · 2017-07-31 11:42:50 +02:00 · ebd2ed8f64
parent 6fe736f2c9
commit ebd2ed8f64
2 changed files with 5 additions and 1 deletions
--- a/changelogs/unreleased/dm-ldap-authentication-ssl-verification.yml
+++ 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:
--- 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