diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 21:11:53 +0100 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 21:11:53 +0100 |
| commit | 729391fbfce4dea58478b65c684a24a1bfd125a2 (patch) | |
| tree | f9f0d9c391744fed388f99d44e96c908ed7aa1f1 /lib/gitlab/ldap/config.rb | |
| parent | 999118f0ec6edabc9e13c089381ad664970a080a (diff) | |
| parent | 8af23def1d6450420d06b8de54d23311a978de20 (diff) | |
| download | gitlab-ce-729391fbfce4dea58478b65c684a24a1bfd125a2.tar.gz | |
Merge commit '8af23def1d6' into object-storage-ee-to-ce-backport
Diffstat (limited to 'lib/gitlab/ldap/config.rb')
| -rw-r--r-- | lib/gitlab/ldap/config.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/ldap/config.rb b/lib/gitlab/ldap/config.rb index 0d9a554fc18..cde60addcf7 100644 --- a/lib/gitlab/ldap/config.rb +++ b/lib/gitlab/ldap/config.rb @@ -42,6 +42,7 @@ module Gitlab else self.class.invalid_provider(provider) end + @options = config_for(@provider) # Use @provider, not provider end |