Skip to content
Snippets Groups Projects
Commit 719f7231 authored by Mitch Tishmack's avatar Mitch Tishmack
Browse files

Apparently the gitlab Travis install has no git user.

Hackily handle this with a begin block and return a default that matches current use.
parent 2c947647
No related branches found
No related tags found
1 merge request!4037Remove user directory path assumptions
Loading
Loading
@@ -58,7 +58,11 @@ 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'] ||= 'git'
Settings.gitlab['user_home'] ||= Etc.getpwnam(Settings.gitlab['user']).dir
Settings.gitlab['user_home'] ||= begin
Etc.getpwnam(Settings.gitlab['user']).dir
rescue ArgumentError # no user configured
'/home/' + Settings.gitlab['user']
end
Settings.gitlab['signup_enabled'] ||= false
Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil?
Settings.gitlab['default_projects_features'] ||= {}
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment