diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-09-08 17:34:18 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-09-08 17:34:18 +0100 |
| commit | 0e9ba0a4fa3a2e8335e7b902dd50710e2309773f (patch) | |
| tree | 4005bafc62781ee9cb74565034963fd4f28e88d9 /config | |
| parent | c915e2c8237ddcae57ec48e700badd9d5bfd8c8c (diff) | |
| download | gitlab-ce-0e9ba0a4fa3a2e8335e7b902dd50710e2309773f.tar.gz | |
Add attributes to LDAP::Config.
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index c47e5dab27c..c23f00a6f05 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -97,6 +97,7 @@ if Settings.ldap['enabled'] || Rails.env.test? server['block_auto_created_users'] = false if server['block_auto_created_users'].nil? server['allow_username_or_email_login'] = false if server['allow_username_or_email_login'].nil? server['active_directory'] = true if server['active_directory'].nil? + server['attributes'] = {} if server['attributes'].nil? server['provider_name'] ||= "ldap#{key}".downcase server['provider_class'] = OmniAuth::Utils.camelize(server['provider_name']) end |