diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-08 21:08:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-08 21:08:30 +0300 |
| commit | 54943f1e68bd4e1951bf3d6c438acab8d783fc31 (patch) | |
| tree | 7528e59c2fd305422f64c44c124ed2cda35b6cd2 /lib/gitlab/auth | |
| parent | 8a7e48133fa53ea53107eafb4e71fbe72545588e (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 9dafd59561a..6c99b505797 100644 --- a/lib/gitlab/auth/ldap/config.rb +++ b/lib/gitlab/auth/ldap/config.rb @@ -82,7 +82,8 @@ module Gitlab def adapter_options opts = base_options.merge( - encryption: encryption_options + encryption: encryption_options, + instrumentation_service: ActiveSupport::Notifications ) opts.merge!(auth_options) if has_auth? |