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 /changelogs | |
| 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 'changelogs')
| -rw-r--r-- | changelogs/unreleased/add_ldap_tls_options.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/add_ldap_tls_options.yml b/changelogs/unreleased/add_ldap_tls_options.yml new file mode 100644 index 00000000000..c3678cb8fb6 --- /dev/null +++ b/changelogs/unreleased/add_ldap_tls_options.yml @@ -0,0 +1,5 @@ +--- +title: Allow raw `tls_options` to be passed in LDAP configuration +merge_request: 20678 +author: +type: changed |