Commit cd8a3029 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix application crash on help page

parent d9270337
......@@ -29,6 +29,9 @@ gitlab:
# Email address used in the "From" field in mails sent by GitLab
email_from: gitlab@localhost
# Email address of your support contanct (default: same as email_from)
support_email: support@localhost
## Project settings
default_projects_limit: 10
# signup_enabled: true # default: false - Account passwords are not sent via the email if signup is enabled.
......
......@@ -49,6 +49,7 @@ Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80
Settings.gitlab['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'] ||= 'gitlab'
Settings.gitlab['signup_enabled'] ||= false
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment