diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-23 12:09:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-23 12:09:47 +0000 |
| commit | 8f9beefac3774b30e911fb00a68f4c7a5244cf27 (patch) | |
| tree | 919c3a043f8c10bc3f78f3f6e029acfb6b972556 /config/initializers | |
| parent | e4bf776a8829e5186a0f63603c0be627b891d80e (diff) | |
| download | gitlab-ce-8f9beefac3774b30e911fb00a68f4c7a5244cf27.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/1_settings.rb | 21 |
1 files changed, 12 insertions, 9 deletions
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? @@ -672,6 +663,18 @@ Gitlab.ee do 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 # Settings['extra'] ||= Settingslogic.new({}) |