From 89d3366e76c73e5d34f6773ece5ba07492a54922 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Date: Tue, 26 Jun 2012 10:55:25 +0300
Subject: [PATCH] Fix ldap blank password

---
 Gemfile      | 10 +++++-----
 Gemfile.lock | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index e7d93382f..44bdb3926 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,10 +10,11 @@ gem "mysql2"
 gem "devise", "~> 1.5"
 
 # GITLAB patched libs
-gem "grit",        :git => "https://github.com/gitlabhq/grit.git",            :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
-gem "gitolite",    :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
-gem "pygments.rb", :git => "https://github.com/gitlabhq/pygments.rb.git",     :ref => "2cada028da5054616634a1d9ca6941b65b3ce188"
-gem 'yaml_db',     :git => "https://github.com/gitlabhq/yaml_db.git"
+gem "grit",          :git => "https://github.com/gitlabhq/grit.git",            :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
+gem "gitolite",      :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
+gem "pygments.rb",   :git => "https://github.com/gitlabhq/pygments.rb.git",     :ref => "2cada028da5054616634a1d9ca6941b65b3ce188"
+gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git",   :ref => "7edf27d0281e09561838122982c16b7e62181f44"
+gem 'yaml_db',       :git => "https://github.com/gitlabhq/yaml_db.git"
 gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"
 
 gem "stamp"
@@ -34,7 +35,6 @@ gem "resque", "~> 1.20.0"
 gem "httparty"
 gem "charlock_holmes"
 gem "foreman"
-gem "omniauth-ldap"
 gem "colored"
 gem 'resque_mailer'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index c454a41ca..8265641f1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -34,6 +34,17 @@ GIT
       pygments.rb (~> 0.2.11)
 
 GIT
+  remote: https://github.com/gitlabhq/omniauth-ldap.git
+  revision: 7edf27d0281e09561838122982c16b7e62181f44
+  ref: 7edf27d0281e09561838122982c16b7e62181f44
+  specs:
+    omniauth-ldap (1.0.2)
+      net-ldap (~> 0.2.2)
+      omniauth (~> 1.0)
+      pyu-ruby-sasl (~> 0.0.3.1)
+      rubyntlm (~> 0.1.1)
+
+GIT
   remote: https://github.com/gitlabhq/pygments.rb.git
   revision: 2cada028da5054616634a1d9ca6941b65b3ce188
   ref: 2cada028da5054616634a1d9ca6941b65b3ce188
@@ -201,11 +212,6 @@ GEM
     omniauth (1.1.0)
       hashie (~> 1.2)
       rack
-    omniauth-ldap (1.0.2)
-      net-ldap (~> 0.2.2)
-      omniauth (~> 1.0)
-      pyu-ruby-sasl (~> 0.0.3.1)
-      rubyntlm (~> 0.1.1)
     orm_adapter (0.0.7)
     polyglot (0.3.3)
     posix-spawn (0.3.6)
@@ -379,7 +385,7 @@ DEPENDENCIES
   minitest (>= 2.10)
   modernizr (= 2.5.3)
   mysql2
-  omniauth-ldap
+  omniauth-ldap!
   pry
   pygments.rb!
   rails (= 3.2.5)
-- 
2.11.0