Commit 265bd122 authored by http://jneen.net/'s avatar http://jneen.net/ Committed by Felipe Artur

do away with the static settings

parent 2145c8c8
......@@ -19,7 +19,7 @@ module EE
module ClassMethods
def support_bot
email = Settings.service_desk.email || "support%s@#{Settings.gitlab.host}"
email_pattern = "support%s@#{Settings.gitlab.host}"
unique_internal(where(support_bot: true), 'support-bot', email) do |u|
u.bio = 'The GitLab support bot'
......
......@@ -554,13 +554,6 @@ Settings.webpack.dev_server['enabled'] ||= false
Settings.webpack.dev_server['host'] ||= 'localhost'
Settings.webpack.dev_server['port'] ||= 3808
#
# ServiceDesk settings
#
Settings['service_desk'] ||= Settingslogic.new({})
Settings.service_desk['user'] ||= nil
Settings.service_desk['email'] ||= nil
#
# Testing settings
#
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment