Commit 079cf85f authored by Dmytro Zaporozhets (DZ)'s avatar Dmytro Zaporozhets (DZ)

Merge branch 'use-gitlab-applogger' into 'master'

Use Gitlab::AppLogger in settings

See merge request gitlab-org/gitlab!58134
parents 395a3f53 4c524510
---
title: Use Gitlab::AppLogger in settings
merge_request: 58134
author: Huzaifa Iftikhar @huzaifaiftikhar
type: other
...@@ -68,7 +68,7 @@ if Settings.ldap['enabled'] || Rails.env.test? ...@@ -68,7 +68,7 @@ if Settings.ldap['enabled'] || Rails.env.test?
server['tls_options'] ||= {} server['tls_options'] ||= {}
if server['ssl_version'] || server['ca_file'] if server['ssl_version'] || server['ca_file']
Rails.logger.warn 'DEPRECATED: LDAP options `ssl_version` and `ca_file` should be nested within `tls_options`' # rubocop:disable Gitlab/RailsLogger Gitlab::AppLogger.warn 'DEPRECATED: LDAP options `ssl_version` and `ca_file` should be nested within `tls_options`'
end end
if server['ssl_version'] if server['ssl_version']
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment