Fix LDAP authentication for Git HTTP access

Conflicts: CHANGELOG

Fix LDAP authentication for Git HTTP access
e8da077d · Jacob Vosmaer · Valery Sizov · ba76dbc3 · e8da077d · e8da077d
Commit e8da077d authored Oct 23, 2014 by Jacob Vosmaer Committed by Valery Sizov Oct 23, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

CHANGELOG CHANGELOG +3 -0

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

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
+v 7.4.1
+  - Fix LDAP authentication for Git HTTP access
 v 7.4.0
  - Refactored membership logic
  - Improve error reporting on users API (Julien Bianchi)

--- 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
@@ -68,4 +68,4 @@ module Gitlab
      end
    end
  end
 end
\ No newline at end of file