Merge branch 'ldap_http_access' into 'master'

Fix LDAP authentication for Git HTTP access See merge request !1211

Merge branch 'ldap_http_access' into 'master'
Fix LDAP authentication for Git HTTP access See merge request !1211
568d6089 · Marin Jankovski · 30eaf484 · 6b2b20af · 568d6089 · 568d6089
Commit 568d6089 authored Oct 23, 2014 by Marin Jankovski
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

CHANGELOG CHANGELOG +1 -0

lib/gitlab/ldap/authentication.rb lib/gitlab/ldap/authentication.rb +2 -2

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
 v 7.5.0
  - API: Add support for Hipchat (Kevin Houdebert)
  - Add time zone configuration on gitlab.yml (Sullivan Senechal)
+  - Fix LDAP authentication for Git HTTP access

 v 7.4.0
  - Refactored membership logic

--- 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)
+        OmniAuth::LDAP::Adaptor.new(config.options.symbolize_keys)
      end

      def config