kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Remove Grit settings from default 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.
This commit is contained in:
Stan Hu 2017-09-23 15:30:58 -04:00
parent b146415798
commit 8edc1d07ee
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/initializers/1_settings.rb
View File

@ -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