diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-25 06:21:13 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-25 06:21:13 +0000 |
| commit | 7da72a0de296e430378c7eb85fc486a01f3163bd (patch) | |
| tree | 5fc2f8d2464b22dc4c5a27f59e9bb9e3b63fa277 | |
| parent | 12edee4bc86256dcd31921f5e34549b1884e92c1 (diff) | |
| parent | 8edc1d07ee3cc0ae95966bf31493ab4ff9317349 (diff) | |
| download | gitlab-ce-7da72a0de296e430378c7eb85fc486a01f3163bd.tar.gz | |
Merge branch 'sh-remove-additional-grit-settings' into 'master'
Remove Grit settings from default settings
See merge request gitlab-org/gitlab-ce!14465
| -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 |