diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-02 15:10:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-02 15:10:35 +0300 |
| commit | 4fa04f789e6fed5f0dfeafe718eeb7f56a5086e9 (patch) | |
| tree | 5ef2d1d8232d3bd359ec79bf95c9a35ce650ae0b /config/initializers/1_settings.rb | |
| parent | 4b9ace6c1fead1b44f173eaee0cfaa58f46a258a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers/1_settings.rb')
| -rw-r--r-- | config/initializers/1_settings.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index da275b34f5d..d3868cfb8cd 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -176,8 +176,8 @@ Settings.gitlab['user'] ||= 'git' Settings.gitlab['ssh_user'] ||= Settings.gitlab.user Settings.gitlab['user_home'] ||= begin Etc.getpwnam(Settings.gitlab['user']).dir -rescue ArgumentError # no user configured - '/home/' + Settings.gitlab['user'] + rescue ArgumentError # no user configured + '/home/' + Settings.gitlab['user'] end Settings.gitlab['time_zone'] ||= nil Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil? |