summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-05-05 14:40:52 +0100
committerSean McGivern <sean@gitlab.com>2017-05-05 14:40:52 +0100
commitfaf2ce89cd4eafdccb78823cf1a32c338a8d9a79 (patch)
tree1931a7f2929a252778400e2b97d44992f5d5725e /config/gitlab.yml.example
parent7e0e45dbf174bb82cc0ea8191a869612ad60b4f7 (diff)
parent0f1273fa44a9122bffbd5cecbaea99b1db781d7e (diff)
downloadgitlab-ce-faf2ce89cd4eafdccb78823cf1a32c338a8d9a79.tar.gz
Merge branch 'mrchrisw-import-shell-timeout'
Diffstat (limited to 'config/gitlab.yml.example')
-rw-r--r--config/gitlab.yml.example3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index c2eaf263937..fa503f84dd0 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