diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-10-23 14:41:03 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-10-23 14:41:03 +0000 |
| commit | 568d60896aedf42877b20160f581cf3b7e46a330 (patch) | |
| tree | 7ee5b010cbec1f7b0776fe038cdd6dcd153dccc1 | |
| parent | 30eaf4840bfc22711758f303fa981a5fc64cd217 (diff) | |
| parent | 6b2b20af417b09e0c6a404206b89e7e2ab7be0ed (diff) | |
| download | gitlab-ce-568d60896aedf42877b20160f581cf3b7e46a330.tar.gz | |
Merge branch 'ldap_http_access' into 'master'
Fix LDAP authentication for Git HTTP access
See merge request !1211
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/gitlab/ldap/authentication.rb | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 3b0a351c86d..e7708bd0c1d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ 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 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 |