Merge branch 'update-omniauth-ldap' into 'master'

Update omniauth-ldap.

See merge request !1713

Gemfile

@@ -45,7 +45,7 @@ gem "gitlab_git", '~> 7.1.0'
 gem 'gitlab-grack', '~> 2.0.0.rc2', require: 'grack'
 
 # LDAP Auth
-gem 'gitlab_omniauth-ldap', '1.2.0', require: "omniauth-ldap"
+gem 'gitlab_omniauth-ldap', '1.2.1', require: "omniauth-ldap"
 
 # Git Wiki
 gem 'gollum-lib', '~> 4.0.0'

Gemfile.lock

@@ -219,7 +219,7 @@ GEM
       gitlab-linguist (~> 3.0)
       rugged (~> 0.21.2)
     gitlab_meta (7.0)
-    gitlab_omniauth-ldap (1.2.0)
+    gitlab_omniauth-ldap (1.2.1)
       net-ldap (~> 0.9)
       omniauth (~> 1.0)
       pyu-ruby-sasl (~> 0.0.3.1)
@@ -336,7 +336,7 @@ GEM
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     mysql2 (0.3.16)
-    net-ldap (0.9.0)
+    net-ldap (0.11)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.8.0)
@@ -516,7 +516,7 @@ GEM
       sexp_processor (~> 4.0)
     ruby_parser (3.5.0)
       sexp_processor (~> 4.1)
-    rubyntlm (0.4.0)
+    rubyntlm (0.5.0)
     rubypants (0.2.0)
     rugged (0.21.4)
     rugments (1.0.0.beta4)
@@ -707,7 +707,7 @@ DEPENDENCIES
   gitlab_emoji (~> 0.1)
   gitlab_git (~> 7.1.0)
   gitlab_meta (= 7.0)
-  gitlab_omniauth-ldap (= 1.2.0)
+  gitlab_omniauth-ldap (= 1.2.1)
   gollum-lib (~> 4.0.0)
   gon (~> 5.0.0)
   grape (~> 0.6.1)