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 | |
| 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')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -68,7 +68,7 @@ gem 'gpgme', '~> 2.0.18' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master -gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap' +gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' gem 'net-ldap' # API |