2 files changed, 12 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 058febb..6553ec6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -14,3 +14,4 @@ Koen Smets <koen.smets@gmail.com>
 Mart Sõmermaa <mart.somermaa@cgi.com>
 Diego Giovane Pasqualin <dpasqualin@c3sl.ufpr.br>
 Crestez Dan Leonard <lcrestez@ixiacom.com>
+Patrick Miller <patrick@velocitywebworks.com>
diff --git a/gitlab b/gitlab
index f0aa460..4332995 100755
--- a/gitlab
+++ b/gitlab
@@ -141,7 +141,7 @@ def usage():
 def do_auth():
     try:
         gl = gitlab.Gitlab(gitlab_url, private_token=gitlab_token,
-                           ssl_verify=ssl_verify)
+                           ssl_verify=ssl_verify, timeout=timeout)
         gl.auth()
     except:
         die("Could not connect to GitLab (%s)" % gitlab_url)
@@ -247,6 +247,7 @@ def do_project_owned():
 
 
 ssl_verify = True
+timeout = 60
 gitlab_id = None
 verbose = False
 
@@ -326,6 +327,15 @@ except:
     pass
 
 try:
+    timeout = config.getboolean('global', 'timeout')
+except:
+    pass
+try:
+    timeout = config.getboolean(gitlab_id, 'timeout')
+except:
+    pass
+
+try:
     what = args.pop(0)
     action = args.pop(0)
 except: