diff options
| author | Michael Kozono <mkozono@gmail.com> | 2017-06-09 10:39:29 -0700 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2017-07-26 02:43:36 -0700 |
| commit | 72d8b1e40aa96f575aac9a8c9dada09e66cd7a9d (patch) | |
| tree | 6e9ce22aa0aa4f6a3e18f52952d95a414f7e5b79 /lib/gitlab/ldap | |
| parent | 2d7d1fa69db2b5e0056d5ab8884684886229f852 (diff) | |
| download | gitlab-ce-72d8b1e40aa96f575aac9a8c9dada09e66cd7a9d.tar.gz | |
Move backwards compatibility logic out of the code
And closer to the configuration setup. The code doesn’t need to know about this.
Diffstat (limited to 'lib/gitlab/ldap')
| -rw-r--r-- | lib/gitlab/ldap/config.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/gitlab/ldap/config.rb b/lib/gitlab/ldap/config.rb index efc3c50e038..db76ee098c5 100644 --- a/lib/gitlab/ldap/config.rb +++ b/lib/gitlab/ldap/config.rb @@ -5,11 +5,7 @@ module Gitlab NET_LDAP_ENCRYPTION_METHOD = { :simple_tls => :simple_tls, :start_tls => :start_tls, - :plain => nil, - - # Deprecated. Better to pass-through the actual `Net::LDAP` encryption type. - :ssl => :simple_tls, - :tls => :start_tls, + :plain => nil } attr_accessor :provider, :options |