From c3ef733fc89f5706b2e67e1e702a92728ea9abc9 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Thu, 14 Jan 2016 09:56:06 +0530
Subject: [PATCH] gitlab: upgrade to CE v8.3.4

---
 Changelog.md                              | 1 +
 Dockerfile                                | 2 +-
 assets/runtime/config/gitlabhq/gitlab.yml | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 51ccb212..9183ef19 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ This file only reflects the changes that are made in this image. Please refer to
 
 **latest**
 - gitlab-workhorse: upgrade to v0.5.4
+- gitlab: upgrade to CE v8.3.4
 
 **8.3.2**
 - gitlab: upgrade to CE v8.3.2
diff --git a/Dockerfile b/Dockerfile
index 31cdc085..aeff348e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM sameersbn/ubuntu:14.04.20151213
 MAINTAINER sameer@damagehead.com
 
-ENV GITLAB_VERSION=8.3.2 \
+ENV GITLAB_VERSION=8.3.4 \
     GITLAB_SHELL_VERSION=2.6.9 \
     GITLAB_WORKHORSE_VERSION=0.5.4 \
     GITLAB_USER="git" \
diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml
index f6acf1b8..7f526a05 100644
--- a/assets/runtime/config/gitlabhq/gitlab.yml
+++ b/assets/runtime/config/gitlabhq/gitlab.yml
@@ -204,6 +204,11 @@ production: &base
         bind_dn: '{{LDAP_BIND_DN}}'
         password: '{{LDAP_PASS}}'
 
+        # Set a timeout, in seconds, for LDAP queries. This helps avoid blocking
+        # a request if the LDAP server becomes unresponsive.
+        # A value of 0 means there is no timeout.
+        timeout: 10
+
         # This setting specifies if LDAP server is Active Directory LDAP server.
         # For non AD servers it skips the AD specific queries.
         # If your LDAP server is not AD, set this to false.