diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-18 00:14:04 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-18 00:14:04 +0000 |
| commit | d2979c778f3ef992570fc81f62fcf3d6f70dac08 (patch) | |
| tree | 34851e123e1249cd199fd0e007251bb119abe4c5 | |
| parent | cb3b671839ccb99fbe100ae1fe684d391a30f191 (diff) | |
| parent | 16b73176694d248d4ee6f8c8525857169872e12e (diff) | |
| download | gitlab-ce-d2979c778f3ef992570fc81f62fcf3d6f70dac08.tar.gz | |
Merge branch 'update-omniauth-ldap' into 'master'
Update omniauth-ldap.
See merge request !1713
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index d6e66707c8a..bcf36897162 100644 --- a/Gemfile.lock +++ b/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) |