summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-09-10 11:15:23 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2014-09-10 11:15:23 +0200
commitf964067c95082ac2960a7bdc7d8968d5d80424c4 (patch)
tree8419088a5f027c2e948fc5c9d13bcaf7845bb964 /Gemfile.lock
parent6b7e80cb198926a07e3fc94ca850edd4ed4169b8 (diff)
downloadgitlab-ce-f964067c95082ac2960a7bdc7d8968d5d80424c4.tar.gz
Update omniauth-ldap and net-ldap
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock8
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index b20f4169174..b5e1a4abddf 100644
--- 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)
- net-ldap (~> 0.3.1)
+ gitlab_omniauth-ldap (1.1.0)
+ 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)