Merge branch 'sh-remove-old-grit-config' into 'master'

Remove unused Grit configuration settings

See merge request gitlab-org/omnibus-gitlab!1956

CHANGELOG.md

@@ -3,6 +3,10 @@
 The latest version of this file can be found at the master branch of the
 omnibus-gitlab repository.
 
+10.1.0
+
+- Remove unused Grit configuration settings
+
 10.0.0
 
 - Use semanage instead of chcon for setting SELinux security contexts (Elliot Wright)

files/gitlab-config-template/gitlab.rb.template

@@ -320,8 +320,6 @@ external_url 'GENERATED_EXTERNAL_URL'
 
 ### GitLab Shell settings for GitLab
 # gitlab_rails['gitlab_shell_ssh_port'] = 22
-# gitlab_rails['git_max_size'] = 20971520
-# gitlab_rails['git_timeout'] = 10
 # gitlab_rails['gitlab_shell_git_timeout'] = 800
 
 ### Extra customization

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -219,8 +219,6 @@ default['gitlab']['gitlab-rails']['gitlab_shell_git_timeout'] = 800
 # Path to the Git Executable
 # defaults to /opt/gitlab/embedded/bin/git. The install-dir path is set at build time
 default['gitlab']['gitlab-rails']['git_bin_path'] = "#{node['package']['install-dir']}/embedded/bin/git"
-default['gitlab']['gitlab-rails']['git_max_size'] = nil
-default['gitlab']['gitlab-rails']['git_timeout'] = nil
 default['gitlab']['gitlab-rails']['extra_google_analytics_id'] = nil
 default['gitlab']['gitlab-rails']['extra_piwik_url'] = nil
 default['gitlab']['gitlab-rails']['extra_piwik_site_id'] = nil

files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb

@@ -439,12 +439,6 @@ production: &base
   # Use the default values unless you really know what you are doing
   git:
     bin_path: <%= @git_bin_path %>
-    # The next value is the maximum memory size grit can use
-    # Given in number of bytes per git object (e.g. a commit)
-    # This value can be increased if you have very large commits
-    max_size: <%= @git_max_size %>
-    # Git timeout to read a commit, in seconds
-    timeout: <%= @git_timeout %>
 
   ## GitLab Geo settings (EE-only)
   geo_primary_role: