diff options
Diffstat (limited to 'www/gitlab/files/patch-config_initializers_1__settings.rb')
| -rw-r--r-- | www/gitlab/files/patch-config_initializers_1__settings.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/www/gitlab/files/patch-config_initializers_1__settings.rb b/www/gitlab/files/patch-config_initializers_1__settings.rb index 79ccb3ef49cb..8a92be748d72 100644 --- a/www/gitlab/files/patch-config_initializers_1__settings.rb +++ b/www/gitlab/files/patch-config_initializers_1__settings.rb @@ -1,8 +1,8 @@ ---- config/initializers/1_settings.rb.orig 2017-06-07 20:58:14 UTC +--- config/initializers/1_settings.rb.orig 2017-06-07 20:48:31 UTC +++ config/initializers/1_settings.rb -@@ -203,12 +203,8 @@ Settings.gitlab['email_subject_suffix'] - Settings.gitlab['base_url'] ||= Settings.send(:build_base_gitlab_url) - Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url) +@@ -215,12 +215,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 @@ -14,4 +14,4 @@ +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'], []) + Settings.gitlab['restricted_visibility_levels'] = Settings.__send__(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], []) |