summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGauvain Pocentek <gauvain.pocentek@objectif-libre.com>2014-10-26 06:46:11 +0100
committerGauvain Pocentek <gauvain.pocentek@objectif-libre.com>2014-10-26 06:46:11 +0100
commit39aa99873e121b4e06ec0876b5b0219ac8944195 (patch)
treed982ab87e447e7cae63b13bb66298b51e5a3a108
parent8be5365ef198ddab12df78e9e7bd0ca971e81724 (diff)
downloadgitlab-39aa99873e121b4e06ec0876b5b0219ac8944195.tar.gz
"Document" the timeout option
-rw-r--r--README.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/README.md b/README.md
index bee94e8..00e7017 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,7 @@ Here's an example of the syntax:
[global]
default = local
ssl_verify = true
+timeout = 5
[local]
url = http://10.0.3.2:8080
@@ -93,6 +94,9 @@ authentication is supported (not user/password).
The `ssl_verify` option defines if the server SSL certificate should be
validated (use false for self signed certificates, only useful with https).
+The `timeout` option defines after how many seconds a request to the Gitlab
+server should be abandonned.
+
Choosing a different server than the default one can be done at run time:
`````