summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG3
-rw-r--r--lib/gitlab/ldap/authentication.rb4
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 05290698320..561a23538e7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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)
diff --git a/lib/gitlab/ldap/authentication.rb b/lib/gitlab/ldap/authentication.rb
index a5944f96983..8af2c74e959 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)
+ 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
+end