summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2017-06-13 14:01:28 -0700
committerMichael Kozono <mkozono@gmail.com>2017-07-26 02:43:40 -0700
commit7f92a36a36ab8183c843982bf91bdabb45861154 (patch)
tree83d7a07f93ff42c370274d898902fca4f56df0b2 /Gemfile.lock
parent951bd2a43161206dbafe2a6099098e5fb48a6005 (diff)
downloadgitlab-ce-7f92a36a36ab8183c843982bf91bdabb45861154.tar.gz
Fix plain LDAP (no encryption)
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 2b2df1b6bcc..661f0294646 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -288,7 +288,7 @@ GEM
mime-types (>= 1.16, < 3)
posix-spawn (~> 0.3)
gitlab-markup (1.5.1)
- gitlab_omniauth-ldap (2.0.1)
+ gitlab_omniauth-ldap (2.0.2)
net-ldap (~> 0.16)
omniauth (~> 1.3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
@@ -978,7 +978,7 @@ DEPENDENCIES
github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.5.1)
- gitlab_omniauth-ldap (~> 2.0.1)
+ gitlab_omniauth-ldap (~> 2.0.2)
gollum-lib (~> 4.2)
gollum-rugged_adapter (~> 0.4.4)
gon (~> 6.1.0)