diff options
| author | Chris Wilson <chris@chrisjwilson.com> | 2017-04-14 11:53:30 +1000 |
|---|---|---|
| committer | Chris Wilson <chris@chrisjwilson.com> | 2017-04-27 10:51:35 +1000 |
| commit | 0f1273fa44a9122bffbd5cecbaea99b1db781d7e (patch) | |
| tree | 1cb3a5dfdb669ff2f5eda3181f91e4ecf127d9dc /config/gitlab.yml.example | |
| parent | 5173baa0046b6656dcbb52bf5447a0de3749fd6a (diff) | |
| download | gitlab-ce-0f1273fa44a9122bffbd5cecbaea99b1db781d7e.tar.gz | |
Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeout
GitLab uses the import_project method in GitLab Shell,
This method uses a timeout for the operation, hardcoded to 800 seconds.
With this MR the timeout is now configurable in the gitlab_shell
settings.
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 06c9f734c2a..ce477001b6f 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -502,6 +502,9 @@ production: &base upload_pack: true receive_pack: true + # Git import/fetch timeout + # git_timeout: 800 + # If you use non-standard ssh port you need to specify it # ssh_port: 22 |