diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-03-05 16:17:23 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-03-05 16:17:23 +0300 |
| commit | ed41f4e6ea6d1a016314823a805fab41aa8d867b (patch) | |
| tree | 7474c76387ef2759b8ee715a7f3a08413b8eab88 /Gemfile.lock | |
| parent | c257dea855bc99fab674914440f191dd627222f7 (diff) | |
| parent | f6350faca1a9680c3ab8f68a05f289c89a4a2272 (diff) | |
Merge branch 'add_ldap_tls_options' into 'master'
Allow raw `tls_options` to be passed in LDAP configuration
Closes #46391
See merge request gitlab-org/gitlab-ce!20678
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 452546b547d..e4791a98f2f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -291,7 +291,7 @@ GEM rubocop (~> 0.54.0) rubocop-gitlab-security (~> 0.1.0) rubocop-rspec (~> 1.19) - gitlab_omniauth-ldap (2.0.4) + gitlab_omniauth-ldap (2.1.1) net-ldap (~> 0.16) omniauth (~> 1.3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) @@ -1024,7 +1024,7 @@ DEPENDENCIES gitlab-markup (~> 1.6.5) gitlab-sidekiq-fetcher (~> 0.4.0) gitlab-styles (~> 2.4) - gitlab_omniauth-ldap (~> 2.0.4) + gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) google-api-client (~> 0.23) google-protobuf (~> 3.6) |