diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-10-23 14:21:21 +0200 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2014-10-23 17:53:19 +0300 |
| commit | e8da077d4f9b63d7d7157416dbf0dad010ea90bd (patch) | |
| tree | 23c09579c787a1fbefde06f0cdb60512979e08dc | |
| parent | ba76dbc3667c2eb0a1a3687f8b0481e619946d73 (diff) | |
| download | gitlab-ce-e8da077d4f9b63d7d7157416dbf0dad010ea90bd.tar.gz | |
Fix LDAP authentication for Git HTTP access
Conflicts:
CHANGELOG
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | lib/gitlab/ldap/authentication.rb | 4 |
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 |