Download as
Browse Code »

Commit c7f8bb4c9b453a803eca4a99eedc692326acb8e9

Authored by Dmitriy Zaporozhets
2 parents f9dd1402 3f972e0e
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'master' of github.com:gitlabhq/gitlabhq

Showing 2 changed files with 0 additions and 4 deletions   Show diff stats
config/gitlab.yml.example
  Diff comments   View file @c7f8bb4
... ... @@ -35,9 +35,6 @@ production: &base
35 35 # Email address used in the "From" field in mails sent by GitLab
36 36 email_from: example@example.com
37 37  
38   - # Email address of your support contact (default: same as email_from)
39   - support_email: support@example.com
40   -
41 38 # Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample).
42 39  
43 40 ## User settings
... ...
config/initializers/1_settings.rb
  Diff comments   View file @c7f8bb4
... ... @@ -79,7 +79,6 @@ Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80
79 79 Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || ''
80 80 Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http"
81 81 Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
82   -Settings.gitlab['support_email'] ||= Settings.gitlab.email_from
83 82 Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
84 83 Settings.gitlab['user'] ||= 'git'
85 84 Settings.gitlab['user_home'] ||= begin
... ...