Commit 7da72a0d authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'sh-remove-additional-grit-settings' into 'master'

Remove Grit settings from default settings

See merge request gitlab-org/gitlab-ce!14465
parents 12edee4b 8edc1d07
...@@ -499,9 +499,7 @@ Settings.backup['upload']['storage_class'] ||= nil ...@@ -499,9 +499,7 @@ Settings.backup['upload']['storage_class'] ||= nil
# Git # Git
# #
Settings['git'] ||= Settingslogic.new({}) Settings['git'] ||= Settingslogic.new({})
Settings.git['max_size'] ||= 20971520 # 20.megabytes Settings.git['bin_path'] ||= '/usr/bin/git'
Settings.git['bin_path'] ||= '/usr/bin/git'
Settings.git['timeout'] ||= 10
# Important: keep the satellites.path setting until GitLab 9.0 at # Important: keep the satellites.path setting until GitLab 9.0 at
# least. This setting is fed to 'rm -rf' in # least. This setting is fed to 'rm -rf' in
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment