Download as
Browse Code »

Commit cd8a302997aa8214de8a8e27fe9bb87c1b8abdf2

Authored by Dmitriy Zaporozhets
1 parent d9270337
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix application crash on help page

Showing 2 changed files with 4 additions and 0 deletions   Show diff stats
config/gitlab.yml.example
  Diff comments   View file @cd8a302
@@ -29,6 +29,9 @@ gitlab: @@ -29,6 +29,9 @@ gitlab:
29 # Email address used in the "From" field in mails sent by GitLab 29 # Email address used in the "From" field in mails sent by GitLab
30 email_from: gitlab@localhost 30 email_from: gitlab@localhost
31 31
  32 + # Email address of your support contanct (default: same as email_from)
  33 + support_email: support@localhost
  34 +
32 ## Project settings 35 ## Project settings
33 default_projects_limit: 10 36 default_projects_limit: 10
34 # signup_enabled: true # default: false - Account passwords are not sent via the email if signup is enabled. 37 # signup_enabled: true # default: false - Account passwords are not sent via the email if signup is enabled.
config/initializers/1_settings.rb
  Diff comments   View file @cd8a302
@@ -49,6 +49,7 @@ Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80 @@ -49,6 +49,7 @@ Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80
49 Settings.gitlab['relative_url_root'] ||= '' 49 Settings.gitlab['relative_url_root'] ||= ''
50 Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http" 50 Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http"
51 Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}" 51 Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
  52 +Settings.gitlab['support_email'] ||= Settings.gitlab.email_from
52 Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url) 53 Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
53 Settings.gitlab['user'] ||= 'gitlab' 54 Settings.gitlab['user'] ||= 'gitlab'
54 Settings.gitlab['signup_enabled'] ||= false 55 Settings.gitlab['signup_enabled'] ||= false