diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-09-23 15:30:58 -0400 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-09-23 20:37:26 -0400 |
| commit | 8edc1d07ee3cc0ae95966bf31493ab4ff9317349 (patch) | |
| tree | dd9457d619ef7586bb7eaca9de953169de5fb343 | |
| parent | b14641579855a14398db260ab909ae77c164c883 (diff) | |
| download | gitlab-ce-sh-remove-additional-grit-settings.tar.gz | |
Remove Grit settings from default settingssh-remove-additional-grit-settings
This is a follow-up to https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1956 and
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7308.
| -rw-r--r-- | config/initializers/1_settings.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 94429ee91a9..27c1ecc7b23 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -499,9 +499,7 @@ Settings.backup['upload']['storage_class'] ||= nil # Git # Settings['git'] ||= Settingslogic.new({}) -Settings.git['max_size'] ||= 20971520 # 20.megabytes -Settings.git['bin_path'] ||= '/usr/bin/git' -Settings.git['timeout'] ||= 10 +Settings.git['bin_path'] ||= '/usr/bin/git' # Important: keep the satellites.path setting until GitLab 9.0 at # least. This setting is fed to 'rm -rf' in |