78a51eed7e
For detailed list of changes please see here: https://about.gitlab.com/2018/06/22/gitlab-11-0-released/ Please make sure before you upgrade you read the entry in UPDATING. Reviewed by: swills (mentor) Approved by: swills (mentor) Differential Revision: https://reviews.freebsd.org/D16127
17 lines
1,023 B
Ruby
17 lines
1,023 B
Ruby
--- config/initializers/1_settings.rb.orig 2018-06-06 20:30:27 UTC
|
|
+++ config/initializers/1_settings.rb
|
|
@@ -125,12 +125,8 @@ Settings.gitlab['email_subject_suffix']
|
|
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'], [])
|