diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 21:09:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 21:09:21 +0300 |
| commit | e0fa0638a422c3e20d4423c9bb69d79afc9c7d3d (patch) | |
| tree | 9abb3c0706576bbda895fe9539a55556930606e2 /config/initializers | |
| parent | f8d15ca65390475e356b06dedc51e10ccd179f86 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/1_settings.rb | 6 |
1 files changed, 6 insertions, 0 deletions
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 @@ -245,6 +245,12 @@ 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 # Settings['artifacts'] ||= Settingslogic.new({}) |