diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2014-10-23 16:41:39 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2014-10-23 16:41:39 +0200 |
| commit | 1c1d9f78a4d7e569fda4ee70603a7bc2472a4ae4 (patch) | |
| tree | d7137e6f8c0077421fee800585c20655b99bbdea /lib | |
| parent | 36649fc25086e8afa645f48d59fae05d57b06d59 (diff) | |
| parent | 568d60896aedf42877b20160f581cf3b7e46a330 (diff) | |
| download | gitlab-ce-1c1d9f78a4d7e569fda4ee70603a7bc2472a4ae4.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ldap/authentication.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |