diff options
| author | Nick Thomas <nick@gitlab.com> | 2017-11-21 17:13:21 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2017-11-21 17:32:37 +0000 |
| commit | afd5911557051c4dae652b386c7a91f746ff18a5 (patch) | |
| tree | 4b6e6e866fb2d15c095fc55c100d5a2a23d88452 /config | |
| parent | 4ebe69600fd7ae9da6fb419d76dd5267d9c3b8ca (diff) | |
| download | gitlab-ce-afd5911557051c4dae652b386c7a91f746ff18a5.tar.gz | |
Set the default gitlab-shell timeout to 3 hours
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 7547ba4a8fa..7f6e68ceed6 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -559,8 +559,8 @@ production: &base upload_pack: true receive_pack: true - # Git import/fetch timeout - # git_timeout: 800 + # Git import/fetch timeout, in seconds. Defaults to 3 hours. + # git_timeout: 10800 # If you use non-standard ssh port you need to specify it # ssh_port: 22 diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index d1156b0c8a8..f7c83f7b0f7 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -429,7 +429,7 @@ Settings.gitlab_shell['ssh_port'] ||= 22 Settings.gitlab_shell['ssh_user'] ||= Settings.gitlab.user Settings.gitlab_shell['owner_group'] ||= Settings.gitlab.user Settings.gitlab_shell['ssh_path_prefix'] ||= Settings.__send__(:build_gitlab_shell_ssh_path_prefix) -Settings.gitlab_shell['git_timeout'] ||= 800 +Settings.gitlab_shell['git_timeout'] ||= 10800 # # Workhorse |