From bac7d17c7b736e09228857f8c8cce8bf6ba70aa7 Mon Sep 17 00:00:00 2001
From: Boris HUISGEN <bhuisgen@hbis.fr>
Date: Thu, 19 Jun 2014 10:41:23 +0200
Subject: [PATCH] Fix LDAP TLS authentication

---
 lib/gitlab/ldap/adapter.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/gitlab/ldap/adapter.rb b/lib/gitlab/ldap/adapter.rb
index e36616f0e66..ca239bea884 100644
--- a/lib/gitlab/ldap/adapter.rb
+++ b/lib/gitlab/ldap/adapter.rb
@@ -14,7 +14,15 @@ module Gitlab
       end
 
       def self.adapter_options
-        encryption = config['method'].to_s == 'ssl' ? :simple_tls : nil
+        encryption =
+          case config['method'].to_s
+          when 'ssl'
+            :simple_tls
+          when 'tls'
+            :start_tls
+          else
+            nil
+          end
 
         options = {
           host: config['host'],