summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-01 14:41:31 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-01 14:41:31 +0300
commit3f972e0e5399a38c6f19ea9ac63361edc3a6e75d (patch)
treee8a3e2140460c3f7e9b6324901b5a2f05f3684ef
parent660585caa41002d9cfbe51842aaa6602b8de2895 (diff)
parent65cf5957deec1816f867f0285b34f314599c905a (diff)
downloadgitlab-ce-3f972e0e5399a38c6f19ea9ac63361edc3a6e75d.tar.gz
Merge pull request #7053 from jvanbaarsen/removed_support_email
Removed the Support Email setting
-rw-r--r--config/gitlab.yml.example3
-rw-r--r--config/initializers/1_settings.rb1
2 files changed, 0 insertions, 4 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 04e85ed9a9d..6f33256a2b1 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -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
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 97f29546404..18c628223a4 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -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