Commit 65cf5957 authored by Jeroen van Baarsen's avatar Jeroen van Baarsen

Removed the Support Email setting

This setting was not longer used in GitLab, so i think it can be
removed.
Signed-off-by: 's avatarJeroen van Baarsen <jeroenvanbaarsen@gmail.com>
parent d54d3324
......@@ -35,9 +35,6 @@ production: &base
# Email address used in the "From" field in mails sent by GitLab
email_from: example@example.com
# Email address of your support contact (default: same as email_from)
support_email: support@example.com
# Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample).
## User settings
......
......@@ -79,7 +79,6 @@ Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80
Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || ''
Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http"
Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
Settings.gitlab['support_email'] ||= Settings.gitlab.email_from
Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
Settings.gitlab['user'] ||= 'git'
Settings.gitlab['user_home'] ||= begin
......
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