From 8f9beefac3774b30e911fb00a68f4c7a5244cf27 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 23 Mar 2020 12:09:47 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/initializers/1_settings.rb | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'config/initializers') diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 81de0ac6818..79bfcfd79e1 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -74,15 +74,6 @@ if Settings.ldap['enabled'] || Rails.env.test? end end -Gitlab.ee do - Settings['smartcard'] ||= Settingslogic.new({}) - Settings.smartcard['enabled'] = false if Settings.smartcard['enabled'].nil? - Settings.smartcard['client_certificate_required_host'] = Settings.gitlab['host'] if Settings.smartcard['client_certificate_required_host'].nil? - Settings.smartcard['client_certificate_required_port'] = 3444 if Settings.smartcard['client_certificate_required_port'].nil? - Settings.smartcard['required_for_git_access'] = false if Settings.smartcard['required_for_git_access'].nil? - Settings.smartcard['san_extensions'] = false if Settings.smartcard['san_extensions'].nil? -end - Settings['omniauth'] ||= Settingslogic.new({}) Settings.omniauth['enabled'] = true if Settings.omniauth['enabled'].nil? Settings.omniauth['auto_sign_in_with_provider'] = false if Settings.omniauth['auto_sign_in_with_provider'].nil? @@ -671,6 +662,18 @@ Gitlab.ee do end end +# +# Smartcard +# +Gitlab.ee do + Settings['smartcard'] ||= Settingslogic.new({}) + Settings.smartcard['enabled'] = false if Settings.smartcard['enabled'].nil? + Settings.smartcard['client_certificate_required_host'] = Settings.gitlab.host if Settings.smartcard['client_certificate_required_host'].nil? + Settings.smartcard['client_certificate_required_port'] = 3444 if Settings.smartcard['client_certificate_required_port'].nil? + Settings.smartcard['required_for_git_access'] = false if Settings.smartcard['required_for_git_access'].nil? + Settings.smartcard['san_extensions'] = false if Settings.smartcard['san_extensions'].nil? +end + # # Extra customization # -- cgit v1.2.1