Fix LDAP authentication for Git HTTP access

Conflicts: CHANGELOG
2014-10-23 14:21:21 +02:00 · 2014-10-23 14:21:21 +02:00 · e8da077d4f
parent ba76dbc366
commit e8da077d4f
2 changed files with 5 additions and 2 deletions
--- a/3
+++ b/3
@ -1,3 +1,6 @@
+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
+end