diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-09-10 13:15:23 +0400 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-09-10 13:15:23 +0400 |
| commit | f964067c95082ac2960a7bdc7d8968d5d80424c4 (patch) | |
| tree | 8419088a5f027c2e948fc5c9d13bcaf7845bb964 | |
| parent | 6b7e80cb198926a07e3fc94ca850edd4ed4169b8 (diff) | |
Update omniauth-ldap and net-ldap
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -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' 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) |