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

Remove Grit settings from default settings

See merge request gitlab-org/gitlab-ce!14465

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
 
 # Important: keep the satellites.path setting until GitLab 9.0 at
 # least. This setting is fed to 'rm -rf' in