deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix application crash on help page

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-01-20 14:17:56 +02:00
parent d9270337c1
commit cd8a302997
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/gitlab.yml.example
View file

@ -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.

1
config/initializers/1_settings.rb
View file

@ -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