opnsense-ports/www/gitlab/files/patch-config_initializers_1__settings.rb
Franco Fichtner 0ef05b2ef0 */*: sync with upstream
Taken from: FreeBSD
2016-06-22 04:45:53 +02:00

17 lines
1,011 B
Ruby

--- config/initializers/1_settings.rb.orig 2016-06-15 01:41:18 UTC
+++ config/initializers/1_settings.rb
@@ -191,12 +191,8 @@ Settings.gitlab['email_reply_to'] ||= EN
Settings.gitlab['base_url'] ||= Settings.send(:build_base_gitlab_url)
Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
Settings.gitlab['user'] ||= 'git'
-Settings.gitlab['user_home'] ||= begin
- Etc.getpwnam(Settings.gitlab['user']).dir
-rescue ArgumentError # no user configured
- '/home/' + Settings.gitlab['user']
-end
-Settings.gitlab['time_zone'] ||= nil
+Settings.gitlab['user_home'] ||= '/usr/home/' + Settings.gitlab['user']
+Settings.gitlab['time_zone'] ||= nil
Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil?
Settings.gitlab['restricted_visibility_levels'] = Settings.send(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], [])