diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-22 15:16:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-22 15:16:22 +0300 |
| commit | 96891fec6dfa20a8342a3daa25935213cfddae22 (patch) | |
| tree | a09d9a3c565d28b33d0bbc1c1202061c8eb061b9 /lib/gitlab/auth | |
| parent | 8bf2e2b73e5898c78dd057e02828b6acc1647a70 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/auth')
| -rw-r--r-- | lib/gitlab/auth/ldap/config.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/auth/ldap/config.rb b/lib/gitlab/auth/ldap/config.rb index 7bfe776fed0..82c6411c712 100644 --- a/lib/gitlab/auth/ldap/config.rb +++ b/lib/gitlab/auth/ldap/config.rb @@ -206,7 +206,8 @@ module Gitlab def base_options { host: options['host'], - port: options['port'] + port: options['port'], + hosts: options['hosts'] } end |