diff options
| author | Michael Kozono <mkozono@gmail.com> | 2017-06-08 15:46:06 -0700 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2017-07-26 02:43:33 -0700 |
| commit | 94b4c9f34f576bbeddc2a22098f33c6ae656d7ab (patch) | |
| tree | e1dcd658afb4acd37293b2a99f05cc5dfdd89012 /lib | |
| parent | 6dbff9663de072279bd027e8e3e453b732f75977 (diff) | |
| download | gitlab-ce-94b4c9f34f576bbeddc2a22098f33c6ae656d7ab.tar.gz | |
Use encryption instead of method
The method key is deprecated in the `gitlab_omniauth-ldap` gem.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ldap/config.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/ldap/config.rb b/lib/gitlab/ldap/config.rb index 6fdf68641e2..c531100fbc4 100644 --- a/lib/gitlab/ldap/config.rb +++ b/lib/gitlab/ldap/config.rb @@ -50,7 +50,7 @@ module Gitlab def omniauth_options opts = base_options.merge( base: base, - method: options['method'], + encryption: options['encryption'], filter: omniauth_user_filter, name_proc: name_proc ) @@ -158,7 +158,7 @@ module Gitlab end def encryption - case options['method'].to_s + case options['encryption'].to_s when 'ssl' :simple_tls when 'tls' |