diff options
| author | Drew Blessing <drew@gitlab.com> | 2018-05-29 15:33:13 -0500 |
|---|---|---|
| committer | Drew Blessing <drew@blessing.io> | 2019-03-04 10:27:43 -0600 |
| commit | f6350faca1a9680c3ab8f68a05f289c89a4a2272 (patch) | |
| tree | ab808414294048953eb33f746e93c59ae82bb329 /Gemfile.lock | |
| parent | bc4ee49ecb1e562543cd196e51eac9a61c016de3 (diff) | |
| download | gitlab-ce-f6350faca1a9680c3ab8f68a05f289c89a4a2272.tar.gz | |
Allow raw `tls_options` to be passed in LDAP configuration
We've previously exposed ca_file and ssl_version but there are many
possible options that can be used inside tls_options. Instead of
exposing individual ones, simply expose the entire hash so it can
be passed in and we won't have to add things in the future.
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 74a06581da2..4c92ab23a28 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) |