summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2019-06-05 14:45:49 +0200
committerJacob Vosmaer <jacob@gitlab.com>2019-06-05 14:45:49 +0200
commit5752e911e65774c99181713dcba63ca1f346e9cf (patch)
tree8e01e816c9f8295ae171d5b820322a81ef147aa1
parent0552e248c1984ba7c5b3a8b7314e26863d2dfb9f (diff)
downloadgitlab-ce-jv-gitaly-rspec-catfile.tar.gz
Fix gitaly rspec failues 'too many open files'jv-gitaly-rspec-catfile
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--lib/gitlab/setup_helper.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 50aceaa7b71..0a3db35b241 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-1.45.0
+1.46.0
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