From: Mitch Tishmack <mitch.tishmack@gmail.com>
Date: Thu, 23 May 2013 17:52:38 +0000 (-0500)
Subject: Apparently the gitlab Travis install has no git user.
X-Git-Tag: v5.3.0~127^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=719f72315f6242a71d8b1fb3eeffc233034a9643;p=wvm%2Fgitlab.git

Apparently the gitlab Travis install has no git user.

Hackily handle this with a begin block and return a default that matches current use.
---

diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 664ca5c78..35118599d 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -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'] ||= {}