Skip to content
Snippets Groups Projects
Commit a225c091 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'bump-net-ldap' into 'master'

Bump net ldap

Related to gitlab/gitlabhq#1700

See merge request !1
parents aaac5627 14f97bda
No related branches found
No related tags found
No related merge requests found
PATH
remote: .
specs:
gitlab_omniauth-ldap (1.0.4)
net-ldap (~> 0.7.0)
gitlab_omniauth-ldap (1.1.0)
net-ldap (~> 0.9)
omniauth (~> 1.0)
pyu-ruby-sasl (~> 0.0.3.1)
rubyntlm (~> 0.1.1)
rubyntlm (~> 0.3)
 
GEM
remote: http://rubygems.org/
Loading
Loading
@@ -14,7 +14,7 @@ GEM
diff-lcs (1.1.3)
hashie (3.3.1)
method_source (0.8.1)
net-ldap (0.7.0)
net-ldap (0.9.0)
omniauth (1.2.2)
hashie (>= 1.2, < 4)
rack (~> 1.0)
Loading
Loading
@@ -35,7 +35,7 @@ GEM
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
rspec-mocks (2.12.1)
rubyntlm (0.1.1)
rubyntlm (0.4.0)
slop (3.3.3)
 
PLATFORMS
Loading
Loading
Loading
Loading
@@ -10,9 +10,9 @@ Gem::Specification.new do |gem|
gem.license = "MIT"
 
gem.add_runtime_dependency 'omniauth', '~> 1.0'
gem.add_runtime_dependency 'net-ldap', '~> 0.7.0'
gem.add_runtime_dependency 'net-ldap', '~> 0.9'
gem.add_runtime_dependency 'pyu-ruby-sasl', '~> 0.0.3.1'
gem.add_runtime_dependency 'rubyntlm', '~> 0.1.1'
gem.add_runtime_dependency 'rubyntlm', '~> 0.3'
 
gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
gem.files = `git ls-files`.split("\n")
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment