diff options
author | Robert Speicher <rspeicher@gmail.com> | 2019-06-20 19:44:39 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2019-06-20 19:44:39 +0300 |
commit | d98bae878f95e27f235d6c674eab839fe5de005a (patch) | |
tree | c2d3fe172a556b5264753f5127b9fc35c86da6ea /config/initializers | |
parent | c6eb18ee0fe1b887438da87f25fc2f2a852dd393 (diff) | |
parent | 0e41564762cd74c6cbf938dcc319c3b77a891dc7 (diff) |
Merge branch 'config-yaml-differences' into 'master'
Backport changes made by EE to various YAML configuration files
See merge request gitlab-org/gitlab-ce!29606
Diffstat (limited to 'config/initializers')
-rw-r--r-- | config/initializers/1_settings.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 0c8d94ccaed..6cca7a3b75f 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -117,6 +117,15 @@ if github_settings end end +# SAML should be enabled for the tests automatically, but only for EE. +saml_provider_enabled = Settings.omniauth.providers.any? do |provider| + provider['name'] == 'group_saml' +end + +if Gitlab.ee? && Rails.env.test? && !saml_provider_enabled + Settings.omniauth.providers << Settingslogic.new({ 'name' => 'group_saml' }) +end + Settings['shared'] ||= Settingslogic.new({}) Settings.shared['path'] = Settings.absolute(Settings.shared['path'] || "shared") @@ -291,6 +300,11 @@ Settings.gravatar['host'] = Settings.host_without_www(Settings.gravatar[ # Cron Jobs # Settings['cron_jobs'] ||= Settingslogic.new({}) + +if Gitlab.ee? && Settings['ee_cron_jobs'] + Settings.cron_jobs.merge!(Settings.ee_cron_jobs) +end + Settings.cron_jobs['stuck_ci_jobs_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['stuck_ci_jobs_worker']['cron'] ||= '0 * * * *' Settings.cron_jobs['stuck_ci_jobs_worker']['job_class'] = 'StuckCiJobsWorker' |