Commit c7f8bb4c9b453a803eca4a99eedc692326acb8e9
Exists in
spb-stable
and in
2 other branches
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
| @@ -35,9 +35,6 @@ production: &base | @@ -35,9 +35,6 @@ production: &base | ||
| 35 | # Email address used in the "From" field in mails sent by GitLab | 35 | # Email address used in the "From" field in mails sent by GitLab |
| 36 | email_from: example@example.com | 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 | # Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample). | 38 | # Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample). |
| 42 | 39 | ||
| 43 | ## User settings | 40 | ## User settings |
config/initializers/1_settings.rb
| @@ -79,7 +79,6 @@ Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80 | @@ -79,7 +79,6 @@ Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80 | ||
| 79 | Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || '' | 79 | Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || '' |
| 80 | Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http" | 80 | Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http" |
| 81 | Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}" | 81 | Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}" |
| 82 | -Settings.gitlab['support_email'] ||= Settings.gitlab.email_from | ||
| 83 | Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url) | 82 | Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url) |
| 84 | Settings.gitlab['user'] ||= 'git' | 83 | Settings.gitlab['user'] ||= 'git' |
| 85 | Settings.gitlab['user_home'] ||= begin | 84 | Settings.gitlab['user_home'] ||= begin |