diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-05-30 20:11:07 +0200 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-05-30 20:11:07 +0200 |
| commit | 65cf5957deec1816f867f0285b34f314599c905a (patch) | |
| tree | 407a6892b0dbe4088182a2ef3227c757a5e68cc3 | |
| parent | d54d3324b1ae46a60712dbb974214e41fca5b93b (diff) | |
| download | gitlab-ce-65cf5957deec1816f867f0285b34f314599c905a.tar.gz | |
Removed the Support Email setting
This setting was not longer used in GitLab, so i think it can be
removed.
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
| -rw-r--r-- | config/gitlab.yml.example | 3 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
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 |