diff options
| author | Patricio Cano <suprnova32@gmail.com> | 2016-02-22 11:59:15 -0500 |
|---|---|---|
| committer | Patricio Cano <suprnova32@gmail.com> | 2016-02-22 11:59:15 -0500 |
| commit | 99edb2a0aa16e852a3919e1bddcc70b315f3c04a (patch) | |
| tree | 4cbacf769945c44be3f6a9b0e915b077f0097965 /config/initializers/1_settings.rb | |
| parent | 8c4cfb1fee508a0ef33232740131a5f03e819941 (diff) | |
| download | gitlab-ce-99edb2a0aa16e852a3919e1bddcc70b315f3c04a.tar.gz | |
Properly set `auto_link_saml_user` default value in the Settings loader.
Diffstat (limited to 'config/initializers/1_settings.rb')
| -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 d8170557f7e..713204b1c51 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -131,6 +131,7 @@ Settings.omniauth['auto_sign_in_with_provider'] = false if Settings.omniauth['au Settings.omniauth['allow_single_sign_on'] = false if Settings.omniauth['allow_single_sign_on'].nil? Settings.omniauth['block_auto_created_users'] = true if Settings.omniauth['block_auto_created_users'].nil? Settings.omniauth['auto_link_ldap_user'] = false if Settings.omniauth['auto_link_ldap_user'].nil? +Settings.omniauth['auto_link_saml_user'] = false if Settings.omniauth['auto_link_saml_user'].nil? Settings.omniauth['providers'] ||= [] Settings.omniauth['cas3'] ||= Settingslogic.new({}) |