gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update default gitlab-shell git timeout to 3 hours

This commit is contained in:
Nick Thomas 2017-11-23 17:41:29 +00:00
parent 2332e08a3e
commit ec9ed9002c
No known key found for this signature in database
GPG Key ID: 2A313A47AFADACE9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/gitlab-cookbooks/gitlab/attributes/default.rb
View File

@ -215,7 +215,7 @@ default['gitlab']['gitlab-rails']['gitlab_shell_hooks_path'] = "#{node['package'
default['gitlab']['gitlab-rails']['gitlab_shell_upload_pack'] = nil
default['gitlab']['gitlab-rails']['gitlab_shell_receive_pack'] = nil
default['gitlab']['gitlab-rails']['gitlab_shell_ssh_port'] = nil
default['gitlab']['gitlab-rails']['gitlab_shell_git_timeout'] = 800
default['gitlab']['gitlab-rails']['gitlab_shell_git_timeout'] = 10800
# 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"

2
spec/chef/recipes/gitlab-rails_spec.rb
View File

@ -464,7 +464,7 @@ describe 'gitlab::gitlab-rails' do
context 'when git_timeout is not configured' do
it 'sets git_timeout value to default' do
expect(chef_run).to render_file(gitlab_yml_path)
.with_content(/git_timeout:\s+800/)
.with_content(/git_timeout:\s+10800/)
end
end
end