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.

Remove Grit settings from default settings
8edc1d07 · Stan Hu · b1464157 · 8edc1d07
Commit 8edc1d07 authored Sep 23, 2017 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

1_settings.rb config/initializers/1_settings.rb +1 -3

No files found.
--- 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