Merge branch 'update_omniauth_ldap' into 'master'

Update omniauth-ldap and net-ldap See merge request !1077

Merge branch 'update_omniauth_ldap' into 'master'
Update omniauth-ldap and net-ldap See merge request !1077
ffb6d27a · Dmitriy Zaporozhets · 83e5211a · f964067c · ffb6d27a · ffb6d27a
Commit ffb6d27a authored Sep 10, 2014 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +4 -4

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -36,7 +36,7 @@ gem "gitlab_git", '~> 6.0'
 gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
 # LDAP Auth
-gem 'gitlab_omniauth-ldap', '1.0.4', require: "omniauth-ldap"
+gem 'gitlab_omniauth-ldap', '1.1.0', require: "omniauth-ldap"
 # Git Wiki
 gem 'gollum-lib', '~> 3.0.0'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -186,8 +186,8 @@ GEM
      gitlab-linguist (~> 3.0)
      rugged (~> 0.21.0)
    gitlab_meta (7.0)
-    gitlab_omniauth-ldap (1.0.4)
+    gitlab_omniauth-ldap (1.1.0)
-      net-ldap (~> 0.3.1)
+      net-ldap (~> 0.7.0)
      omniauth (~> 1.0)
      pyu-ruby-sasl (~> 0.0.3.1)
      rubyntlm (~> 0.1.1)
@@ -292,7 +292,7 @@ GEM
    multi_xml (0.5.5)
    multipart-post (1.2.0)
    mysql2 (0.3.16)
-    net-ldap (0.3.1)
+    net-ldap (0.7.0)
    net-scp (1.1.2)
      net-ssh (>= 2.6.5)
    net-ssh (2.8.0)
@@ -616,7 +616,7 @@ DEPENDENCIES
  gitlab_emoji (~> 0.0.1.1)
  gitlab_git (~> 6.0)
  gitlab_meta (= 7.0)
-  gitlab_omniauth-ldap (= 1.0.4)
+  gitlab_omniauth-ldap (= 1.1.0)
  gollum-lib (~> 3.0.0)
  gon (~> 5.0.0)
  grape (~> 0.6.1)