deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix ldap blank password

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-06-26 10:55:25 +03:00
parent 6d92aa6d12
commit 89d3366e76
2 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Gemfile
View file

@ -10,10 +10,11 @@ gem "mysql2"
gem "devise", "~> 1.5" gem "devise", "~> 1.5"
# GITLAB patched libs # GITLAB patched libs
gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837" gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0" 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 "pygments.rb", :git => "https://github.com/gitlabhq/pygments.rb.git", :ref => "2cada028da5054616634a1d9ca6941b65b3ce188"
gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git" 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 "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"
gem "stamp" gem "stamp"
@ -34,7 +35,6 @@ gem "resque", "~> 1.20.0"
gem "httparty" gem "httparty"
gem "charlock_holmes" gem "charlock_holmes"
gem "foreman" gem "foreman"
gem "omniauth-ldap"
gem "colored" gem "colored"
gem 'resque_mailer' gem 'resque_mailer'

18
Gemfile.lock
View file

@ -33,6 +33,17 @@ GIT
mime-types (~> 1.18) mime-types (~> 1.18)
pygments.rb (~> 0.2.11) 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 GIT
remote: https://github.com/gitlabhq/pygments.rb.git remote: https://github.com/gitlabhq/pygments.rb.git
revision: 2cada028da5054616634a1d9ca6941b65b3ce188 revision: 2cada028da5054616634a1d9ca6941b65b3ce188
@ -201,11 +212,6 @@ GEM
omniauth (1.1.0) omniauth (1.1.0)
hashie (~> 1.2) hashie (~> 1.2)
rack 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) orm_adapter (0.0.7)
polyglot (0.3.3) polyglot (0.3.3)
posix-spawn (0.3.6) posix-spawn (0.3.6)
@ -379,7 +385,7 @@ DEPENDENCIES
minitest (>= 2.10) minitest (>= 2.10)
modernizr (= 2.5.3) modernizr (= 2.5.3)
mysql2 mysql2
omniauth-ldap omniauth-ldap!
pry pry
pygments.rb! pygments.rb!
rails (= 3.2.5) rails (= 3.2.5)