Merge branch 'saml-link-default' into 'master'

Properly set `auto_link_saml_user` default value in the Settings loader.

See merge request !2922

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({})