Skip to content

Commit

Permalink
Merge branch 'bump-net-ldap' into 'master'
Browse files Browse the repository at this point in the history
Bump net ldap

Related to gitlab/gitlabhq#1700

See merge request !1
  • Loading branch information
dzaporozhets committed Oct 29, 2014
2 parents aaac562 + 14f97bd commit a225c09
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
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/
Expand All @@ -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)
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gitlab_omniauth-ldap.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit a225c09

Please sign in to comment.