Merge branch 'jv-gitaly-rspec-catfile' into 'master'

Fix gitaly rspec failures 'too many open files'

Closes gitaly#1711

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

1 files changed, 1 insertions, 0 deletions

diff --git a/lib/gitlab/setup_helper.rb b/lib/gitlab/setup_helper.rb
index 2b7e12639be..61fcb562106 100644
--- a/lib/gitlab/setup_helper.rb
+++ b/lib/gitlab/setup_helper.rb
@@ -43,6 +43,7 @@ module Gitlab
         config[:'gitaly-ruby'] = { dir: File.join(gitaly_dir, 'ruby') } if gitaly_ruby
         config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path }
         config[:bin_dir] = Gitlab.config.gitaly.client_path
+        config[:git] = { catfile_cache_size: 5 }
 
         TomlRB.dump(config)
       end