Merge branch 'master' into 'master'

net-ldap version update

There is a bug in net-ldap < 0.5.0 preventing connections to Microsoft servers. Pushing the net-ldap dependency version should fix it. See the following net-ldap issue for a description.

ruby-ldap/ruby-net-ldap#80

See merge request !2

Author: jacobvosmaer

Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     gitlab_omniauth-ldap (1.0.4)
-      net-ldap (~> 0.3.1)
+      net-ldap (~> 0.7.0)
       omniauth (~> 1.0)
       pyu-ruby-sasl (~> 0.0.3.1)
       rubyntlm (~> 0.1.1)
@@ -12,12 +12,12 @@ GEM
   specs:
     coderay (1.0.8)
     diff-lcs (1.1.3)
-    hashie (1.2.0)
+    hashie (3.3.1)
     method_source (0.8.1)
-    net-ldap (0.3.1)
-    omniauth (1.1.1)
-      hashie (~> 1.2)
-      rack
+    net-ldap (0.7.0)
+    omniauth (1.2.2)
+      hashie (>= 1.2, < 4)
+      rack (~> 1.0)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)

gitlab_omniauth-ldap.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.license       = "MIT"
 
   gem.add_runtime_dependency     'omniauth', '~> 1.0'
-  gem.add_runtime_dependency     'net-ldap', '~> 0.3.1'
+  gem.add_runtime_dependency     'net-ldap', '~> 0.7.0'
   gem.add_runtime_dependency     'pyu-ruby-sasl', '~> 0.0.3.1'
   gem.add_runtime_dependency     'rubyntlm', '~> 0.1.1'