Download as
Browse Code »

Commit 89d3366e76c73e5d34f6773ece5ba07492a54922

Authored by Dmitriy Zaporozhets
1 parent 6d92aa6d
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix ldap blank password

Showing 2 changed files with 17 additions and 11 deletions   Show diff stats
@@ -10,10 +10,11 @@ gem "mysql2" @@ -10,10 +10,11 @@ gem "mysql2"
10 gem "devise", "~> 1.5" 10 gem "devise", "~> 1.5"
11 11
12 # GITLAB patched libs 12 # GITLAB patched libs
13 -gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"  
14 -gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"  
15 -gem "pygments.rb", :git => "https://github.com/gitlabhq/pygments.rb.git", :ref => "2cada028da5054616634a1d9ca6941b65b3ce188"  
16 -gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git" 13 +gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
  14 +gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
  15 +gem "pygments.rb", :git => "https://github.com/gitlabhq/pygments.rb.git", :ref => "2cada028da5054616634a1d9ca6941b65b3ce188"
  16 +gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "7edf27d0281e09561838122982c16b7e62181f44"
  17 +gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
17 gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git" 18 gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"
18 19
19 gem "stamp" 20 gem "stamp"
@@ -34,7 +35,6 @@ gem "resque", "~> 1.20.0" @@ -34,7 +35,6 @@ gem "resque", "~> 1.20.0"
34 gem "httparty" 35 gem "httparty"
35 gem "charlock_holmes" 36 gem "charlock_holmes"
36 gem "foreman" 37 gem "foreman"
37 -gem "omniauth-ldap"  
38 gem "colored" 38 gem "colored"
39 gem 'resque_mailer' 39 gem 'resque_mailer'
40 40
@@ -34,6 +34,17 @@ GIT @@ -34,6 +34,17 @@ GIT
34 pygments.rb (~> 0.2.11) 34 pygments.rb (~> 0.2.11)
35 35
36 GIT 36 GIT
  37 + remote: https://github.com/gitlabhq/omniauth-ldap.git
  38 + revision: 7edf27d0281e09561838122982c16b7e62181f44
  39 + ref: 7edf27d0281e09561838122982c16b7e62181f44
  40 + specs:
  41 + omniauth-ldap (1.0.2)
  42 + net-ldap (~> 0.2.2)
  43 + omniauth (~> 1.0)
  44 + pyu-ruby-sasl (~> 0.0.3.1)
  45 + rubyntlm (~> 0.1.1)
  46 +
  47 +GIT
37 remote: https://github.com/gitlabhq/pygments.rb.git 48 remote: https://github.com/gitlabhq/pygments.rb.git
38 revision: 2cada028da5054616634a1d9ca6941b65b3ce188 49 revision: 2cada028da5054616634a1d9ca6941b65b3ce188
39 ref: 2cada028da5054616634a1d9ca6941b65b3ce188 50 ref: 2cada028da5054616634a1d9ca6941b65b3ce188
@@ -201,11 +212,6 @@ GEM @@ -201,11 +212,6 @@ GEM
201 omniauth (1.1.0) 212 omniauth (1.1.0)
202 hashie (~> 1.2) 213 hashie (~> 1.2)
203 rack 214 rack
204 - omniauth-ldap (1.0.2)  
205 - net-ldap (~> 0.2.2)  
206 - omniauth (~> 1.0)  
207 - pyu-ruby-sasl (~> 0.0.3.1)  
208 - rubyntlm (~> 0.1.1)  
209 orm_adapter (0.0.7) 215 orm_adapter (0.0.7)
210 polyglot (0.3.3) 216 polyglot (0.3.3)
211 posix-spawn (0.3.6) 217 posix-spawn (0.3.6)
@@ -379,7 +385,7 @@ DEPENDENCIES @@ -379,7 +385,7 @@ DEPENDENCIES
379 minitest (>= 2.10) 385 minitest (>= 2.10)
380 modernizr (= 2.5.3) 386 modernizr (= 2.5.3)
381 mysql2 387 mysql2
382 - omniauth-ldap 388 + omniauth-ldap!
383 pry 389 pry
384 pygments.rb! 390 pygments.rb!
385 rails (= 3.2.5) 391 rails (= 3.2.5)