From ebd2ed8f644ba4f0fcaff979d4de41f773b31fdd Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Mon, 31 Jul 2017 11:42:50 +0200
Subject: [PATCH] Pass OmniAuth formatted options to OmniAuth::LDAP::Adaptor

---
 .../unreleased/dm-ldap-authentication-ssl-verification.yml    | 4 ++++
 lib/gitlab/ldap/authentication.rb                             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/dm-ldap-authentication-ssl-verification.yml

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