From e0fa0638a422c3e20d4423c9bb69d79afc9c7d3d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 27 Feb 2020 18:09:21 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/initializers/1_settings.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'config/initializers') diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 5f07b486aea..156cf78dfc4 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -244,6 +244,12 @@ Settings.gitlab_ci['url'] ||= Settings.__send__(:build_gitlab_ci Settings['incoming_email'] ||= Settingslogic.new({}) Settings.incoming_email['enabled'] = false if Settings.incoming_email['enabled'].nil? +# +# Service desk email +# +Settings['service_desk_email'] ||= Settingslogic.new({}) +Settings.service_desk_email['enabled'] = false if Settings.service_desk_email['enabled'].nil? + # # Build Artifacts # -- cgit v1.2.1