diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-02-22 17:48:23 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-02-22 17:48:23 +0000 |
| commit | 7479f0602e85c5355b9ba09786e6e0ed09d21551 (patch) | |
| tree | da87981003cc4aae0105d46233c0e9768f2780d8 | |
| parent | 81e5c9c28966d2a7662bd60b9f1ea68f4aadb936 (diff) | |
| parent | 99edb2a0aa16e852a3919e1bddcc70b315f3c04a (diff) | |
| download | gitlab-ce-7479f0602e85c5355b9ba09786e6e0ed09d21551.tar.gz | |
Merge branch 'saml-link-default' into 'master'
Properly set `auto_link_saml_user` default value in the Settings loader.
See merge request !2922
| -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({}) |